WIP reform2: motherboard PCB tweaks, NVMe/M.2 holes/distances - reform - MNT Reform: Open Source Portable Computer

commit 87b0af3f594dfbc636d352509c34682cd4157c77
parent 583a4c7bcebdc8dc70fc40645c26e6b00f97c407
Author: mntmn <lukas@mntmn.com>
Date:   Tue,  2 Jul 2019 23:09:44 +0200

WIP reform2: motherboard PCB tweaks, NVMe/M.2 holes/distances

Diffstat:
M reform2-motherboard/reform2-motherboard/reform2-motherboard.kicad_pcb  | 5475 +++++++++++++++++++++++++++++++++++++++----------------------------------------

1 file changed, 2727 insertions(+), 2748 deletions(-)
diff --git a/reform2-motherboard/reform2-motherboard/reform2-motherboard.kicad_pcb b/reform2-motherboard/reform2-motherboard/reform2-motherboard.kicad_pcb
@@ -2,11 +2,11 @@
 
   (general
     (thickness 1.6)
-    (drawings 21)
+    (drawings 20)
     (tracks 0)
     (zones 0)
-    (modules 234)
-    (nets 682)
+    (modules 235)
+    (nets 686)
   )
 
   (page A3)
@@ -62,8 +62,8 @@
     (mod_edge_width 0.12)
     (mod_text_size 1 1)
     (mod_text_width 0.15)
-    (pad_size 1.524 1.524)
-    (pad_drill 0.762)
+    (pad_size 3.8 3.8)
+    (pad_drill 2.2)
     (pad_to_mask_clearance 0.051)
     (solder_mask_min_width 0.25)
     (aux_axis_origin 0 0)
@@ -320,466 +320,470 @@
   (net 219 SD2_WP)
   (net 220 "Net-(U1-PadA12)")
   (net 221 "Net-(U1-PadA11)")
-  (net 222 "Net-(BT1-Pad2)")
-  (net 223 "Net-(BT1-Pad1)")
-  (net 224 "Net-(BT2-Pad2)")
-  (net 225 "Net-(BT3-Pad2)")
-  (net 226 "Net-(BT4-Pad2)")
-  (net 227 "Net-(BT5-Pad2)")
-  (net 228 "Net-(BT6-Pad2)")
-  (net 229 "Net-(BT7-Pad2)")
-  (net 230 "Net-(C1-Pad2)")
-  (net 231 "Net-(C1-Pad1)")
-  (net 232 "Net-(C2-Pad1)")
-  (net 233 "Net-(C4-Pad1)")
-  (net 234 "/Reform 2 Power/VREG")
-  (net 235 "Net-(C6-Pad1)")
-  (net 236 +3V3)
-  (net 237 "Net-(C16-Pad1)")
-  (net 238 +5V)
-  (net 239 "Net-(C20-Pad1)")
-  (net 240 "Net-(C21-Pad1)")
-  (net 241 "Net-(C23-Pad1)")
-  (net 242 "Net-(C24-Pad1)")
-  (net 243 "Net-(C25-Pad1)")
-  (net 244 "Net-(C26-Pad1)")
-  (net 245 "Net-(C27-Pad2)")
-  (net 246 "Net-(C30-Pad1)")
-  (net 247 "Net-(D1-Pad1)")
-  (net 248 "Net-(D3-Pad2)")
-  (net 249 "Net-(D4-Pad2)")
-  (net 250 "Net-(D5-Pad2)")
-  (net 251 "Net-(D6-Pad2)")
-  (net 252 "Net-(D7-Pad2)")
-  (net 253 "Net-(D8-Pad2)")
-  (net 254 "Net-(D10-Pad1)")
-  (net 255 "Net-(D11-Pad2)")
-  (net 256 "Net-(D11-Pad1)")
-  (net 257 "Net-(D12-Pad2)")
-  (net 258 "Net-(D12-Pad1)")
-  (net 259 "Net-(D13-Pad2)")
-  (net 260 "Net-(D13-Pad1)")
-  (net 261 "Net-(D14-Pad2)")
-  (net 262 "Net-(D14-Pad1)")
-  (net 263 "Net-(D15-Pad2)")
-  (net 264 "Net-(D15-Pad1)")
-  (net 265 "Net-(D16-Pad2)")
-  (net 266 "Net-(D16-Pad1)")
-  (net 267 "Net-(D17-Pad2)")
-  (net 268 "Net-(D17-Pad1)")
-  (net 269 "Net-(D18-Pad2)")
-  (net 270 "Net-(D18-Pad1)")
-  (net 271 "Net-(J2-Pad30)")
-  (net 272 "/Reform 2 Display/EDP_BL_VCC")
-  (net 273 "Net-(J2-Pad25)")
-  (net 274 "Net-(J2-Pad24)")
-  (net 275 "/Reform 2 Display/EDP_BL_PWM")
-  (net 276 "/Reform 2 Display/EDP_BL_ENABLE")
-  (net 277 "/Reform 2 Display/EDP_BL_GND")
-  (net 278 "/Reform 2 Display/EDP_HPD")
-  (net 279 "/Reform 2 Display/EDP_LCD_VCC")
-  (net 280 "/Reform 2 Display/EDP_LCD_TEST")
-  (net 281 EDP_AUX_DN)
-  (net 282 EDP_AUX_DP)
-  (net 283 EDP_TX0_DN)
-  (net 284 EDP_TX0_DP)
-  (net 285 EDP_TX1_DN)
-  (net 286 EDP_TX1_DP)
-  (net 287 "Net-(J2-Pad1)")
-  (net 288 "Net-(J4-Pad16)")
-  (net 289 "Net-(J4-Pad14)")
-  (net 290 "Net-(J4-Pad19)")
-  (net 291 "Net-(J4-Pad15)")
-  (net 292 "Net-(J4-Pad13)")
-  (net 293 "Net-(L1-Pad2)")
-  (net 294 ETH0_A-)
-  (net 295 ETH0_A+)
-  (net 296 ETH0_D-)
-  (net 297 ETH0_D+)
-  (net 298 ETH0_B+)
-  (net 299 ETH0_C+)
-  (net 300 ETH0_C-)
-  (net 301 ETH0_B-)
-  (net 302 ETH0_LED_RX)
-  (net 303 "Net-(P1-Pad15)")
-  (net 304 ETH0_LED_LINK)
-  (net 305 "Net-(Q3-Pad1)")
-  (net 306 BATPWR)
-  (net 307 "Net-(Q5-Pad1)")
-  (net 308 "Net-(Q6-Pad1)")
-  (net 309 "Net-(Q7-Pad1)")
-  (net 310 "Net-(Q8-Pad1)")
-  (net 311 "Net-(Q9-Pad1)")
-  (net 312 "Net-(Q10-Pad1)")
-  (net 313 "Net-(Q11-Pad1)")
-  (net 314 "Net-(Q12-Pad1)")
-  (net 315 "Net-(R4-Pad2)")
-  (net 316 "Net-(R5-Pad2)")
-  (net 317 "Net-(R6-Pad2)")
-  (net 318 "Net-(R17-Pad2)")
-  (net 319 "Net-(R18-Pad2)")
-  (net 320 "Net-(R19-Pad2)")
-  (net 321 "Net-(R20-Pad2)")
-  (net 322 "Net-(R21-Pad2)")
-  (net 323 "Net-(R22-Pad2)")
-  (net 324 "Net-(R23-Pad2)")
-  (net 325 "Net-(R24-Pad2)")
-  (net 326 HDMI_HPD)
-  (net 327 HDMI_SCL)
-  (net 328 HDMI_I2C)
-  (net 329 DSI_D3_N)
-  (net 330 DSI_D3_P)
-  (net 331 DSI_D0_N)
-  (net 332 DSI_D0_P)
-  (net 333 DSI_CLK_N)
-  (net 334 DSI_CLK_P)
-  (net 335 DSI_D1_N)
-  (net 336 DSI_D1_P)
-  (net 337 DSI_D2_N)
-  (net 338 DSI_D2_P)
-  (net 339 UART1_TX)
-  (net 340 UART1_RX)
-  (net 341 USB1_RX_N)
-  (net 342 USB1_RX_P)
-  (net 343 USB1_TX_N)
-  (net 344 USB1_TX_P)
-  (net 345 USB1_DN)
-  (net 346 USB1_DP)
-  (net 347 "Net-(U3-Pad3)")
-  (net 348 BMON_CS)
-  (net 349 BMON_SDO)
-  (net 350 BMON_SDI)
-  (net 351 BMON_SCK)
-  (net 352 "Net-(U4-Pad30)")
-  (net 353 "Net-(U4-Pad29)")
-  (net 354 "Net-(U4-Pad9)")
-  (net 355 "Net-(U4-Pad7)")
-  (net 356 "Net-(U4-Pad5)")
-  (net 357 "Net-(U4-Pad3)")
-  (net 358 "Net-(U5-Pad3)")
-  (net 359 "Net-(U6-Pad13)")
-  (net 360 "Net-(U6-Pad7)")
-  (net 361 "Net-(U9-Pad60)")
-  (net 362 "Net-(U9-Pad50)")
-  (net 363 "Net-(U9-Pad47)")
-  (net 364 "Net-(U9-Pad46)")
-  (net 365 "Net-(U9-Pad44)")
-  (net 366 "Net-(U9-Pad43)")
-  (net 367 "Net-(U9-Pad41)")
-  (net 368 "Net-(U9-Pad39)")
-  (net 369 "Net-(U10-Pad60)")
-  (net 370 "Net-(U10-Pad58)")
-  (net 371 "Net-(U10-Pad57)")
-  (net 372 "Net-(U10-Pad56)")
-  (net 373 "Net-(U10-Pad55)")
-  (net 374 "Net-(U10-Pad54)")
-  (net 375 "Net-(U10-Pad50)")
-  (net 376 "Net-(U10-Pad47)")
-  (net 377 "Net-(U10-Pad46)")
-  (net 378 "Net-(U10-Pad45)")
-  (net 379 "Net-(U10-Pad44)")
-  (net 380 "Net-(U10-Pad13)")
-  (net 381 "Net-(U10-Pad12)")
-  (net 382 "Net-(U10-Pad11)")
-  (net 383 "Net-(U10-Pad10)")
-  (net 384 "Net-(U10-Pad9)")
-  (net 385 "Net-(U10-Pad8)")
-  (net 386 "Net-(U10-Pad7)")
-  (net 387 "Net-(U10-Pad6)")
-  (net 388 "Net-(U10-Pad5)")
-  (net 389 "Net-(U10-Pad4)")
-  (net 390 "Net-(U11-Pad1)")
-  (net 391 "Net-(U11-Pad3)")
-  (net 392 "Net-(U11-Pad6)")
-  (net 393 "Net-(U11-Pad5)")
-  (net 394 "Net-(U11-Pad8)")
-  (net 395 "Net-(U11-Pad7)")
-  (net 396 "Net-(U11-Pad10)")
-  (net 397 "Net-(U11-Pad12)")
-  (net 398 "Net-(U11-Pad14)")
-  (net 399 "Net-(U11-Pad16)")
-  (net 400 "Net-(U11-Pad17)")
-  (net 401 "Net-(U11-Pad20)")
-  (net 402 "Net-(U11-Pad19)")
-  (net 403 "Net-(U11-Pad28)")
-  (net 404 "Net-(U11-Pad30)")
-  (net 405 "Net-(U11-Pad32)")
-  (net 406 "Net-(U11-Pad36)")
-  (net 407 "Net-(U11-Pad38)")
-  (net 408 "Net-(U11-Pad42)")
-  (net 409 "Net-(U11-Pad46)")
-  (net 410 "Net-(U11-Pad45)")
-  (net 411 "Net-(U11-Pad48)")
-  (net 412 "Net-(U11-Pad47)")
-  (net 413 "Net-(U11-Pad49)")
-  (net 414 "Net-(U11-Pad51)")
-  (net 415 "Net-(U12-Pad1)")
-  (net 416 "Net-(U12-Pad3)")
-  (net 417 "Net-(U12-Pad6)")
-  (net 418 "Net-(U12-Pad5)")
-  (net 419 "Net-(U12-Pad8)")
-  (net 420 "Net-(U12-Pad7)")
-  (net 421 HDMI_CEC)
-  (net 422 HDMI_SDA)
-  (net 423 +36V)
-  (net 424 "Net-(C32-Pad1)")
-  (net 425 "Net-(C33-Pad1)")
-  (net 426 "Net-(C34-Pad1)")
-  (net 427 +1V2)
-  (net 428 +1V1)
-  (net 429 "Net-(C39-Pad2)")
-  (net 430 USB3_2_SSTXN)
-  (net 431 "Net-(C40-Pad2)")
-  (net 432 USB3_1_SSTXN)
-  (net 433 "Net-(C41-Pad2)")
-  (net 434 USB3_2_SSTXP)
-  (net 435 "Net-(C42-Pad2)")
-  (net 436 USB3_1_SSTXP)
-  (net 437 USB_PWR)
-  (net 438 "Net-(C44-Pad1)")
-  (net 439 "Net-(C45-Pad1)")
-  (net 440 "Net-(D3-Pad1)")
-  (net 441 "Net-(D19-Pad1)")
-  (net 442 "Net-(D19-Pad2)")
-  (net 443 "Net-(D20-Pad1)")
-  (net 444 "Net-(D21-Pad1)")
-  (net 445 "Net-(D22-Pad2)")
-  (net 446 "Net-(D22-Pad1)")
-  (net 447 "Net-(F1-Pad1)")
-  (net 448 "Net-(F2-Pad2)")
-  (net 449 "Net-(FB1-Pad2)")
-  (net 450 "Net-(FB2-Pad2)")
-  (net 451 "Net-(J5-Pad10)")
-  (net 452 USB3_2_SSRXP)
-  (net 453 USB3_2_SSRXN)
-  (net 454 USB3_2_DP)
-  (net 455 USB3_2_DN)
-  (net 456 USB3_2_VBUS)
-  (net 457 "Net-(J6-Pad10)")
-  (net 458 "Net-(J6-Pad7)")
-  (net 459 USB3_1_SSRXP)
-  (net 460 USB3_1_SSRXN)
-  (net 461 USB3_1_DP)
-  (net 462 USB3_1_DN)
-  (net 463 USB3_1_VBUS)
-  (net 464 "Net-(J7-Pad5)")
-  (net 465 "Net-(J7-Pad3)")
-  (net 466 "Net-(J7-Pad6)")
-  (net 467 "Net-(J7-Pad1)")
-  (net 468 "Net-(J7-Pad4)")
-  (net 469 "Net-(J7-Pad2)")
-  (net 470 "Net-(Q1-Pad5)")
-  (net 471 "Net-(Q1-Pad4)")
-  (net 472 "Net-(Q2-Pad4)")
-  (net 473 "Net-(R3-Pad2)")
-  (net 474 "Net-(R3-Pad1)")
-  (net 475 "Net-(R49-Pad1)")
-  (net 476 "Net-(R51-Pad2)")
-  (net 477 "Net-(R52-Pad1)")
-  (net 478 "Net-(R54-Pad2)")
-  (net 479 "Net-(R57-Pad1)")
-  (net 480 "Net-(R58-Pad1)")
-  (net 481 "Net-(R59-Pad1)")
-  (net 482 "Net-(R60-Pad1)")
-  (net 483 "Net-(R61-Pad1)")
-  (net 484 "Net-(R63-Pad1)")
-  (net 485 "Net-(R64-Pad2)")
-  (net 486 EDP_SCL)
-  (net 487 +1V8)
-  (net 488 EDP_SDA)
-  (net 489 PCIE1_CLK_N)
-  (net 490 PCIE1_CLK_P)
-  (net 491 PCIE2_CLK_N)
-  (net 492 PCIE2_CLK_P)
-  (net 493 PCIE2_RX_P)
-  (net 494 PCIE2_RX_N)
-  (net 495 PCIE2_TX_P)
-  (net 496 PCIE2_TX_N)
-  (net 497 PCIE1_RX_P)
-  (net 498 PCIE1_RX_N)
-  (net 499 PCIE1_TX_P)
-  (net 500 PCIE1_TX_N)
-  (net 501 "Net-(U3-Pad7)")
-  (net 502 "Net-(U3-Pad5)")
-  (net 503 "Net-(U4-Pad28)")
-  (net 504 "Net-(U5-Pad7)")
-  (net 505 "Net-(U5-Pad5)")
-  (net 506 USB3_1_EN)
-  (net 507 USB3_2_EN)
-  (net 508 USB3_3_EN)
-  (net 509 USB3_4_EN)
-  (net 510 USB3_4_SSRXN)
-  (net 511 USB3_4_SSRXP)
-  (net 512 USB3_4_SSTXN)
-  (net 513 USB3_4_SSTXP)
-  (net 514 USB3_4_DN)
-  (net 515 USB3_4_DP)
-  (net 516 USB3_3_SSRXN)
-  (net 517 USB3_3_SSRXP)
-  (net 518 USB3_3_SSTXN)
-  (net 519 USB3_3_SSTXP)
-  (net 520 USB3_3_DN)
-  (net 521 USB3_3_DP)
-  (net 522 EDP_IRQ)
-  (net 523 EDP_RESETn)
-  (net 524 PCIE_RESETn)
-  (net 525 "Net-(U13-Pad4)")
-  (net 526 "Net-(U14-Pad4)")
-  (net 527 "Net-(U15-Pad11)")
-  (net 528 "Net-(U15-Pad10)")
-  (net 529 "Net-(U15-Pad7)")
-  (net 530 "Net-(U15-Pad6)")
-  (net 531 "Net-(U16-Pad11)")
-  (net 532 "Net-(U16-Pad10)")
-  (net 533 "Net-(U16-Pad9)")
-  (net 534 "Net-(U16-Pad8)")
-  (net 535 "Net-(U16-Pad7)")
-  (net 536 "Net-(U16-Pad6)")
-  (net 537 "Net-(U16-Pad5)")
-  (net 538 "Net-(U16-Pad4)")
-  (net 539 "Net-(U16-Pad3)")
-  (net 540 "Net-(U16-Pad2)")
-  (net 541 "Net-(U16-Pad1)")
-  (net 542 "Net-(U17-Pad28)")
-  (net 543 "Net-(U17-Pad27)")
-  (net 544 "Net-(U17-Pad26)")
-  (net 545 "Net-(U17-Pad25)")
-  (net 546 "Net-(U17-Pad24)")
-  (net 547 "Net-(U17-Pad23)")
-  (net 548 "Net-(U17-Pad22)")
-  (net 549 "Net-(U17-Pad21)")
-  (net 550 "Net-(U17-Pad20)")
-  (net 551 "Net-(U17-Pad19)")
-  (net 552 "Net-(U17-Pad18)")
-  (net 553 "Net-(U17-Pad17)")
-  (net 554 "Net-(U17-Pad16)")
-  (net 555 "Net-(U17-Pad15)")
-  (net 556 "Net-(U17-Pad14)")
-  (net 557 "Net-(U17-Pad13)")
-  (net 558 "Net-(U17-Pad12)")
-  (net 559 "Net-(U17-Pad11)")
-  (net 560 "Net-(U17-Pad10)")
-  (net 561 "Net-(U17-Pad9)")
-  (net 562 "Net-(U17-Pad8)")
-  (net 563 "Net-(U17-Pad7)")
-  (net 564 "Net-(U17-Pad6)")
-  (net 565 "Net-(U17-Pad5)")
-  (net 566 "Net-(U17-Pad4)")
-  (net 567 "Net-(U17-Pad3)")
-  (net 568 "Net-(U17-Pad2)")
-  (net 569 "Net-(U17-Pad1)")
-  (net 570 "Net-(C48-Pad1)")
-  (net 571 "Net-(C51-Pad1)")
-  (net 572 "Net-(C52-Pad1)")
-  (net 573 "Net-(C58-Pad1)")
-  (net 574 "Net-(J5-Pad7)")
-  (net 575 "Net-(J8-Pad3)")
-  (net 576 "Net-(J8-Pad4)")
-  (net 577 "Net-(J8-Pad1)")
-  (net 578 "Net-(J8-Pad2)")
-  (net 579 "Net-(J9-Pad4)")
-  (net 580 "Net-(J9-Pad3)")
-  (net 581 "Net-(J9-Pad2)")
-  (net 582 "Net-(J9-Pad1)")
-  (net 583 "Net-(J10-Pad1)")
-  (net 584 "Net-(J10-Pad5)")
-  (net 585 "Net-(J10-Pad9)")
-  (net 586 "Net-(J10-Pad6)")
-  (net 587 "Net-(J10-Pad7)")
-  (net 588 "Net-(J10-Pad8)")
-  (net 589 CHG_SDA)
-  (net 590 CHG_SCL)
-  (net 591 "Net-(R70-Pad2)")
-  (net 592 "Net-(R72-Pad2)")
-  (net 593 "/Reform 2 Power/LPC_SCK1b")
-  (net 594 "/Reform 2 Power/LPC_MISO1b")
-  (net 595 "/Reform 2 Power/LPC_MOSI1b")
-  (net 596 "/Reform 2 Power/LPC_SSEL1")
-  (net 597 "Net-(R77-Pad2)")
-  (net 598 "/Reform 2 Power/LPC_UFTOGG")
-  (net 599 USB2_RX_N)
-  (net 600 USB2_RX_P)
-  (net 601 USB2_TX_N)
-  (net 602 USB2_TX_P)
-  (net 603 USB2_DN)
-  (net 604 USB2_DP)
-  (net 605 USBH_SCL)
-  (net 606 USBH_SDA)
-  (net 607 "Net-(U12-Pad4)")
-  (net 608 "Net-(U12-Pad2)")
-  (net 609 "Net-(U18-Pad48)")
-  (net 610 "/Reform 2 Power/LPC_TXDa")
-  (net 611 "/Reform 2 Power/LPC_RXDa")
-  (net 612 "/Reform 2 Power/LPC_SCLKa")
-  (net 613 "/Reform 2 Power/LPC_SCK1a")
-  (net 614 "/Reform 2 Power/LPC_AD7")
-  (net 615 "/Reform 2 Power/LPC_AD5")
-  (net 616 "/Reform 2 Power/LPC_SWDIO")
-  (net 617 "/Reform 2 Power/LPC_RXDb")
-  (net 618 "/Reform 2 Power/LPC_TXDb")
-  (net 619 "/Reform 2 Power/LPC_TRST")
-  (net 620 "/Reform 2 Power/LPC_TDO")
-  (net 621 "/Reform 2 Power/LPC_TMS")
-  (net 622 "/Reform 2 Power/LPC_TDI")
-  (net 623 "/Reform 2 Power/LPC_SCK0b")
-  (net 624 "/Reform 2 Power/LPC_MISO1a")
-  (net 625 "/Reform 2 Power/LPC_SCK0a")
-  (net 626 "/Reform 2 Power/LPC_MOSI0")
-  (net 627 "/Reform 2 Power/LPC_MISO0")
-  (net 628 "Net-(U18-Pad25)")
-  (net 629 "/Reform 2 Power/LPC_SCLKc")
-  (net 630 "/Reform 2 Power/LPC_NCTS")
-  (net 631 "/Reform 2 Power/LPC_NUSBCON")
-  (net 632 "/Reform 2 Power/LPC_SCLKb")
-  (net 633 "/Reform 2 Power/LPC_MOSI1a")
-  (net 634 "/Reform 2 Power/LPC_UVBUS")
-  (net 635 "/Reform 2 Power/LPC_TXDc")
-  (net 636 "/Reform 2 Power/LPC_RXDc")
-  (net 637 "/Reform 2 Power/LPC_SSEL0")
-  (net 638 "Net-(U18-Pad9)")
-  (net 639 "/Reform 2 Power/LPC_NRESET")
-  (net 640 "/Reform 2 Power/LPC_NDTR")
-  (net 641 "Net-(U18-Pad1)")
-  (net 642 "Net-(J10-Pad75)")
-  (net 643 "Net-(J10-Pad69)")
-  (net 644 "/Reform 2 PCIe/M2_SUSCLK")
-  (net 645 "Net-(J10-Pad67)")
-  (net 646 "Net-(J10-Pad66)")
-  (net 647 "Net-(J10-Pad65)")
-  (net 648 "Net-(J10-Pad64)")
-  (net 649 "Net-(J10-Pad63)")
-  (net 650 "Net-(J10-Pad62)")
-  (net 651 "Net-(J10-Pad61)")
-  (net 652 "Net-(J10-Pad60)")
-  (net 653 "Net-(J10-Pad59)")
-  (net 654 "Net-(J10-Pad58)")
-  (net 655 "Net-(J10-Pad56)")
-  (net 656 "/Reform 2 PCIe/M2_NPEWAKE")
-  (net 657 "Net-(J10-Pad52)")
-  (net 658 "Net-(J10-Pad48)")
-  (net 659 "Net-(J10-Pad46)")
-  (net 660 "Net-(J10-Pad44)")
-  (net 661 "Net-(J10-Pad42)")
-  (net 662 "Net-(J10-Pad40)")
-  (net 663 "/Reform 2 PCIe/M2_DEVSLP")
-  (net 664 "Net-(J10-Pad37)")
-  (net 665 "Net-(J10-Pad36)")
-  (net 666 "Net-(J10-Pad35)")
-  (net 667 "Net-(J10-Pad34)")
-  (net 668 "Net-(J10-Pad32)")
-  (net 669 "Net-(J10-Pad31)")
-  (net 670 "Net-(J10-Pad30)")
-  (net 671 "Net-(J10-Pad29)")
-  (net 672 "Net-(J10-Pad28)")
-  (net 673 "Net-(J10-Pad26)")
-  (net 674 "Net-(J10-Pad25)")
-  (net 675 "Net-(J10-Pad24)")
-  (net 676 "Net-(J10-Pad23)")
-  (net 677 "Net-(J10-Pad22)")
-  (net 678 "Net-(J10-Pad21)")
-  (net 679 "Net-(J10-Pad20)")
-  (net 680 "Net-(J10-Pad11)")
-  (net 681 "/Reform 2 PCIe/M2_DAS_DSS")
+  (net 222 "Net-(C1-Pad2)")
+  (net 223 "Net-(C1-Pad1)")
+  (net 224 "Net-(C2-Pad1)")
+  (net 225 "Net-(C4-Pad1)")
+  (net 226 "/Reform 2 Power/VREG")
+  (net 227 "Net-(C6-Pad1)")
+  (net 228 +3V3)
+  (net 229 "Net-(C16-Pad1)")
+  (net 230 +5V)
+  (net 231 "Net-(C20-Pad1)")
+  (net 232 "Net-(C21-Pad1)")
+  (net 233 "Net-(C23-Pad1)")
+  (net 234 "Net-(C24-Pad1)")
+  (net 235 "Net-(C25-Pad1)")
+  (net 236 "Net-(C26-Pad1)")
+  (net 237 "Net-(C27-Pad2)")
+  (net 238 "Net-(C30-Pad1)")
+  (net 239 "Net-(D1-Pad1)")
+  (net 240 "Net-(D3-Pad2)")
+  (net 241 "Net-(D4-Pad2)")
+  (net 242 "Net-(D5-Pad2)")
+  (net 243 "Net-(D6-Pad2)")
+  (net 244 "Net-(D7-Pad2)")
+  (net 245 "Net-(D8-Pad2)")
+  (net 246 "Net-(D10-Pad1)")
+  (net 247 "Net-(D11-Pad2)")
+  (net 248 "Net-(D11-Pad1)")
+  (net 249 "Net-(D12-Pad2)")
+  (net 250 "Net-(D12-Pad1)")
+  (net 251 "Net-(D13-Pad2)")
+  (net 252 "Net-(D13-Pad1)")
+  (net 253 "Net-(D14-Pad2)")
+  (net 254 "Net-(D14-Pad1)")
+  (net 255 "Net-(D15-Pad2)")
+  (net 256 "Net-(D15-Pad1)")
+  (net 257 "Net-(D16-Pad2)")
+  (net 258 "Net-(D16-Pad1)")
+  (net 259 "Net-(D17-Pad2)")
+  (net 260 "Net-(D17-Pad1)")
+  (net 261 "Net-(D18-Pad2)")
+  (net 262 "Net-(D18-Pad1)")
+  (net 263 "Net-(J2-Pad30)")
+  (net 264 "/Reform 2 Display/EDP_BL_VCC")
+  (net 265 "Net-(J2-Pad25)")
+  (net 266 "Net-(J2-Pad24)")
+  (net 267 "/Reform 2 Display/EDP_BL_PWM")
+  (net 268 "/Reform 2 Display/EDP_BL_ENABLE")
+  (net 269 "/Reform 2 Display/EDP_BL_GND")
+  (net 270 "/Reform 2 Display/EDP_HPD")
+  (net 271 "/Reform 2 Display/EDP_LCD_VCC")
+  (net 272 "/Reform 2 Display/EDP_LCD_TEST")
+  (net 273 EDP_AUX_DN)
+  (net 274 EDP_AUX_DP)
+  (net 275 EDP_TX0_DN)
+  (net 276 EDP_TX0_DP)
+  (net 277 EDP_TX1_DN)
+  (net 278 EDP_TX1_DP)
+  (net 279 "Net-(J2-Pad1)")
+  (net 280 "Net-(J4-Pad16)")
+  (net 281 "Net-(J4-Pad14)")
+  (net 282 "Net-(J4-Pad19)")
+  (net 283 "Net-(J4-Pad15)")
+  (net 284 "Net-(J4-Pad13)")
+  (net 285 "Net-(L1-Pad2)")
+  (net 286 ETH0_A-)
+  (net 287 ETH0_A+)
+  (net 288 ETH0_D-)
+  (net 289 ETH0_D+)
+  (net 290 ETH0_B+)
+  (net 291 ETH0_C+)
+  (net 292 ETH0_C-)
+  (net 293 ETH0_B-)
+  (net 294 ETH0_LED_RX)
+  (net 295 "Net-(P1-Pad15)")
+  (net 296 ETH0_LED_LINK)
+  (net 297 "Net-(Q3-Pad1)")
+  (net 298 BATPWR)
+  (net 299 "Net-(Q5-Pad1)")
+  (net 300 "Net-(Q6-Pad1)")
+  (net 301 "Net-(Q7-Pad1)")
+  (net 302 "Net-(Q8-Pad1)")
+  (net 303 "Net-(Q9-Pad1)")
+  (net 304 "Net-(Q10-Pad1)")
+  (net 305 "Net-(Q11-Pad1)")
+  (net 306 "Net-(Q12-Pad1)")
+  (net 307 "Net-(R4-Pad2)")
+  (net 308 "Net-(R5-Pad2)")
+  (net 309 "Net-(R6-Pad2)")
+  (net 310 "Net-(R17-Pad2)")
+  (net 311 "Net-(R18-Pad2)")
+  (net 312 "Net-(R19-Pad2)")
+  (net 313 "Net-(R20-Pad2)")
+  (net 314 "Net-(R21-Pad2)")
+  (net 315 "Net-(R22-Pad2)")
+  (net 316 "Net-(R23-Pad2)")
+  (net 317 "Net-(R24-Pad2)")
+  (net 318 HDMI_HPD)
+  (net 319 HDMI_SCL)
+  (net 320 HDMI_I2C)
+  (net 321 DSI_D3_N)
+  (net 322 DSI_D3_P)
+  (net 323 DSI_D0_N)
+  (net 324 DSI_D0_P)
+  (net 325 DSI_CLK_N)
+  (net 326 DSI_CLK_P)
+  (net 327 DSI_D1_N)
+  (net 328 DSI_D1_P)
+  (net 329 DSI_D2_N)
+  (net 330 DSI_D2_P)
+  (net 331 UART1_TX)
+  (net 332 UART1_RX)
+  (net 333 USB1_RX_N)
+  (net 334 USB1_RX_P)
+  (net 335 USB1_TX_N)
+  (net 336 USB1_TX_P)
+  (net 337 USB1_DN)
+  (net 338 USB1_DP)
+  (net 339 "Net-(U3-Pad3)")
+  (net 340 BMON_CS)
+  (net 341 BMON_SDO)
+  (net 342 BMON_SDI)
+  (net 343 BMON_SCK)
+  (net 344 "Net-(U4-Pad30)")
+  (net 345 "Net-(U4-Pad29)")
+  (net 346 "Net-(U4-Pad9)")
+  (net 347 "Net-(U4-Pad7)")
+  (net 348 "Net-(U4-Pad5)")
+  (net 349 "Net-(U4-Pad3)")
+  (net 350 "Net-(U5-Pad3)")
+  (net 351 "Net-(U6-Pad13)")
+  (net 352 "Net-(U6-Pad7)")
+  (net 353 "Net-(U9-Pad60)")
+  (net 354 "Net-(U9-Pad50)")
+  (net 355 "Net-(U9-Pad47)")
+  (net 356 "Net-(U9-Pad46)")
+  (net 357 "Net-(U9-Pad44)")
+  (net 358 "Net-(U9-Pad43)")
+  (net 359 "Net-(U9-Pad41)")
+  (net 360 "Net-(U9-Pad39)")
+  (net 361 "Net-(U10-Pad60)")
+  (net 362 "Net-(U10-Pad58)")
+  (net 363 "Net-(U10-Pad57)")
+  (net 364 "Net-(U10-Pad56)")
+  (net 365 "Net-(U10-Pad55)")
+  (net 366 "Net-(U10-Pad54)")
+  (net 367 "Net-(U10-Pad50)")
+  (net 368 "Net-(U10-Pad47)")
+  (net 369 "Net-(U10-Pad46)")
+  (net 370 "Net-(U10-Pad45)")
+  (net 371 "Net-(U10-Pad44)")
+  (net 372 "Net-(U10-Pad13)")
+  (net 373 "Net-(U10-Pad12)")
+  (net 374 "Net-(U10-Pad11)")
+  (net 375 "Net-(U10-Pad10)")
+  (net 376 "Net-(U10-Pad9)")
+  (net 377 "Net-(U10-Pad8)")
+  (net 378 "Net-(U10-Pad7)")
+  (net 379 "Net-(U10-Pad6)")
+  (net 380 "Net-(U10-Pad5)")
+  (net 381 "Net-(U10-Pad4)")
+  (net 382 "Net-(U11-Pad1)")
+  (net 383 "Net-(U11-Pad3)")
+  (net 384 "Net-(U11-Pad6)")
+  (net 385 "Net-(U11-Pad5)")
+  (net 386 "Net-(U11-Pad8)")
+  (net 387 "Net-(U11-Pad7)")
+  (net 388 "Net-(U11-Pad10)")
+  (net 389 "Net-(U11-Pad12)")
+  (net 390 "Net-(U11-Pad14)")
+  (net 391 "Net-(U11-Pad16)")
+  (net 392 "Net-(U11-Pad17)")
+  (net 393 "Net-(U11-Pad20)")
+  (net 394 "Net-(U11-Pad19)")
+  (net 395 "Net-(U11-Pad28)")
+  (net 396 "Net-(U11-Pad30)")
+  (net 397 "Net-(U11-Pad32)")
+  (net 398 "Net-(U11-Pad36)")
+  (net 399 "Net-(U11-Pad38)")
+  (net 400 "Net-(U11-Pad42)")
+  (net 401 "Net-(U11-Pad46)")
+  (net 402 "Net-(U11-Pad45)")
+  (net 403 "Net-(U11-Pad48)")
+  (net 404 "Net-(U11-Pad47)")
+  (net 405 "Net-(U11-Pad49)")
+  (net 406 "Net-(U11-Pad51)")
+  (net 407 "Net-(U12-Pad1)")
+  (net 408 "Net-(U12-Pad3)")
+  (net 409 "Net-(U12-Pad6)")
+  (net 410 "Net-(U12-Pad5)")
+  (net 411 "Net-(U12-Pad8)")
+  (net 412 "Net-(U12-Pad7)")
+  (net 413 HDMI_CEC)
+  (net 414 HDMI_SDA)
+  (net 415 +36V)
+  (net 416 "Net-(C32-Pad1)")
+  (net 417 "Net-(C33-Pad1)")
+  (net 418 "Net-(C34-Pad1)")
+  (net 419 +1V2)
+  (net 420 +1V1)
+  (net 421 "Net-(C39-Pad2)")
+  (net 422 USB3_2_SSTXN)
+  (net 423 "Net-(C40-Pad2)")
+  (net 424 USB3_1_SSTXN)
+  (net 425 "Net-(C41-Pad2)")
+  (net 426 USB3_2_SSTXP)
+  (net 427 "Net-(C42-Pad2)")
+  (net 428 USB3_1_SSTXP)
+  (net 429 USB_PWR)
+  (net 430 "Net-(C44-Pad1)")
+  (net 431 "Net-(C45-Pad1)")
+  (net 432 "Net-(D3-Pad1)")
+  (net 433 "Net-(D19-Pad1)")
+  (net 434 "Net-(D19-Pad2)")
+  (net 435 "Net-(D20-Pad1)")
+  (net 436 "Net-(D21-Pad1)")
+  (net 437 "Net-(D22-Pad2)")
+  (net 438 "Net-(D22-Pad1)")
+  (net 439 "Net-(F1-Pad1)")
+  (net 440 "Net-(F2-Pad2)")
+  (net 441 "Net-(FB1-Pad2)")
+  (net 442 "Net-(FB2-Pad2)")
+  (net 443 "Net-(J5-Pad10)")
+  (net 444 USB3_2_SSRXP)
+  (net 445 USB3_2_SSRXN)
+  (net 446 USB3_2_DP)
+  (net 447 USB3_2_DN)
+  (net 448 USB3_2_VBUS)
+  (net 449 "Net-(J6-Pad10)")
+  (net 450 "Net-(J6-Pad7)")
+  (net 451 USB3_1_SSRXP)
+  (net 452 USB3_1_SSRXN)
+  (net 453 USB3_1_DP)
+  (net 454 USB3_1_DN)
+  (net 455 USB3_1_VBUS)
+  (net 456 "Net-(J7-Pad5)")
+  (net 457 "Net-(J7-Pad3)")
+  (net 458 "Net-(J7-Pad6)")
+  (net 459 "Net-(J7-Pad1)")
+  (net 460 "Net-(J7-Pad4)")
+  (net 461 "Net-(J7-Pad2)")
+  (net 462 "Net-(Q1-Pad5)")
+  (net 463 "Net-(Q1-Pad4)")
+  (net 464 "Net-(Q2-Pad4)")
+  (net 465 "Net-(R3-Pad2)")
+  (net 466 "Net-(R3-Pad1)")
+  (net 467 "Net-(R49-Pad1)")
+  (net 468 "Net-(R51-Pad2)")
+  (net 469 "Net-(R52-Pad1)")
+  (net 470 "Net-(R54-Pad2)")
+  (net 471 "Net-(R57-Pad1)")
+  (net 472 "Net-(R58-Pad1)")
+  (net 473 "Net-(R59-Pad1)")
+  (net 474 "Net-(R60-Pad1)")
+  (net 475 "Net-(R61-Pad1)")
+  (net 476 "Net-(R63-Pad1)")
+  (net 477 "Net-(R64-Pad2)")
+  (net 478 EDP_SCL)
+  (net 479 +1V8)
+  (net 480 EDP_SDA)
+  (net 481 PCIE1_CLK_N)
+  (net 482 PCIE1_CLK_P)
+  (net 483 PCIE2_CLK_N)
+  (net 484 PCIE2_CLK_P)
+  (net 485 PCIE2_RX_P)
+  (net 486 PCIE2_RX_N)
+  (net 487 PCIE2_TX_P)
+  (net 488 PCIE2_TX_N)
+  (net 489 PCIE1_RX_P)
+  (net 490 PCIE1_RX_N)
+  (net 491 PCIE1_TX_P)
+  (net 492 PCIE1_TX_N)
+  (net 493 "Net-(U3-Pad7)")
+  (net 494 "Net-(U3-Pad5)")
+  (net 495 "Net-(U4-Pad28)")
+  (net 496 "Net-(U5-Pad7)")
+  (net 497 "Net-(U5-Pad5)")
+  (net 498 USB3_1_EN)
+  (net 499 USB3_2_EN)
+  (net 500 USB3_3_EN)
+  (net 501 USB3_4_EN)
+  (net 502 USB3_4_SSRXN)
+  (net 503 USB3_4_SSRXP)
+  (net 504 USB3_4_SSTXN)
+  (net 505 USB3_4_SSTXP)
+  (net 506 USB3_4_DN)
+  (net 507 USB3_4_DP)
+  (net 508 USB3_3_SSRXN)
+  (net 509 USB3_3_SSRXP)
+  (net 510 USB3_3_SSTXN)
+  (net 511 USB3_3_SSTXP)
+  (net 512 USB3_3_DN)
+  (net 513 USB3_3_DP)
+  (net 514 EDP_IRQ)
+  (net 515 EDP_RESETn)
+  (net 516 PCIE_RESETn)
+  (net 517 "Net-(U13-Pad4)")
+  (net 518 "Net-(U14-Pad4)")
+  (net 519 "Net-(U15-Pad11)")
+  (net 520 "Net-(U15-Pad10)")
+  (net 521 "Net-(U15-Pad7)")
+  (net 522 "Net-(U15-Pad6)")
+  (net 523 "Net-(U16-Pad11)")
+  (net 524 "Net-(U16-Pad10)")
+  (net 525 "Net-(U16-Pad9)")
+  (net 526 "Net-(U16-Pad8)")
+  (net 527 "Net-(U16-Pad7)")
+  (net 528 "Net-(U16-Pad6)")
+  (net 529 "Net-(U16-Pad5)")
+  (net 530 "Net-(U16-Pad4)")
+  (net 531 "Net-(U16-Pad3)")
+  (net 532 "Net-(U16-Pad2)")
+  (net 533 "Net-(U16-Pad1)")
+  (net 534 "Net-(U17-Pad28)")
+  (net 535 "Net-(U17-Pad27)")
+  (net 536 "Net-(U17-Pad26)")
+  (net 537 "Net-(U17-Pad25)")
+  (net 538 "Net-(U17-Pad24)")
+  (net 539 "Net-(U17-Pad23)")
+  (net 540 "Net-(U17-Pad22)")
+  (net 541 "Net-(U17-Pad21)")
+  (net 542 "Net-(U17-Pad20)")
+  (net 543 "Net-(U17-Pad19)")
+  (net 544 "Net-(U17-Pad18)")
+  (net 545 "Net-(U17-Pad17)")
+  (net 546 "Net-(U17-Pad16)")
+  (net 547 "Net-(U17-Pad15)")
+  (net 548 "Net-(U17-Pad14)")
+  (net 549 "Net-(U17-Pad13)")
+  (net 550 "Net-(U17-Pad12)")
+  (net 551 "Net-(U17-Pad11)")
+  (net 552 "Net-(U17-Pad10)")
+  (net 553 "Net-(U17-Pad9)")
+  (net 554 "Net-(U17-Pad8)")
+  (net 555 "Net-(U17-Pad7)")
+  (net 556 "Net-(U17-Pad6)")
+  (net 557 "Net-(U17-Pad5)")
+  (net 558 "Net-(U17-Pad4)")
+  (net 559 "Net-(U17-Pad3)")
+  (net 560 "Net-(U17-Pad2)")
+  (net 561 "Net-(U17-Pad1)")
+  (net 562 "Net-(C48-Pad1)")
+  (net 563 "Net-(C51-Pad1)")
+  (net 564 "Net-(C52-Pad1)")
+  (net 565 "Net-(C58-Pad1)")
+  (net 566 "Net-(J5-Pad7)")
+  (net 567 "Net-(J8-Pad3)")
+  (net 568 "Net-(J8-Pad4)")
+  (net 569 "Net-(J8-Pad1)")
+  (net 570 "Net-(J8-Pad2)")
+  (net 571 "Net-(J9-Pad4)")
+  (net 572 "Net-(J9-Pad3)")
+  (net 573 "Net-(J9-Pad2)")
+  (net 574 "Net-(J9-Pad1)")
+  (net 575 "Net-(J10-Pad1)")
+  (net 576 "Net-(J10-Pad5)")
+  (net 577 "Net-(J10-Pad9)")
+  (net 578 "Net-(J10-Pad6)")
+  (net 579 "Net-(J10-Pad7)")
+  (net 580 "Net-(J10-Pad8)")
+  (net 581 CHG_SDA)
+  (net 582 CHG_SCL)
+  (net 583 "Net-(R70-Pad2)")
+  (net 584 "Net-(R72-Pad2)")
+  (net 585 "/Reform 2 Power/LPC_SCK1b")
+  (net 586 "/Reform 2 Power/LPC_MISO1b")
+  (net 587 "/Reform 2 Power/LPC_MOSI1b")
+  (net 588 "/Reform 2 Power/LPC_SSEL1")
+  (net 589 "Net-(R77-Pad2)")
+  (net 590 "/Reform 2 Power/LPC_UFTOGG")
+  (net 591 USB2_RX_N)
+  (net 592 USB2_RX_P)
+  (net 593 USB2_TX_N)
+  (net 594 USB2_TX_P)
+  (net 595 USB2_DN)
+  (net 596 USB2_DP)
+  (net 597 USBH_SCL)
+  (net 598 USBH_SDA)
+  (net 599 "Net-(U12-Pad4)")
+  (net 600 "Net-(U12-Pad2)")
+  (net 601 "Net-(U18-Pad48)")
+  (net 602 "/Reform 2 Power/LPC_TXDa")
+  (net 603 "/Reform 2 Power/LPC_RXDa")
+  (net 604 "/Reform 2 Power/LPC_SCLKa")
+  (net 605 "/Reform 2 Power/LPC_SCK1a")
+  (net 606 "/Reform 2 Power/LPC_AD7")
+  (net 607 "/Reform 2 Power/LPC_AD5")
+  (net 608 "/Reform 2 Power/LPC_SWDIO")
+  (net 609 "/Reform 2 Power/LPC_RXDb")
+  (net 610 "/Reform 2 Power/LPC_TXDb")
+  (net 611 "/Reform 2 Power/LPC_TRST")
+  (net 612 "/Reform 2 Power/LPC_TDO")
+  (net 613 "/Reform 2 Power/LPC_TMS")
+  (net 614 "/Reform 2 Power/LPC_TDI")
+  (net 615 "/Reform 2 Power/LPC_SCK0b")
+  (net 616 "/Reform 2 Power/LPC_MISO1a")
+  (net 617 "/Reform 2 Power/LPC_SCK0a")
+  (net 618 "/Reform 2 Power/LPC_MOSI0")
+  (net 619 "/Reform 2 Power/LPC_MISO0")
+  (net 620 "Net-(U18-Pad25)")
+  (net 621 "/Reform 2 Power/LPC_SCLKc")
+  (net 622 "/Reform 2 Power/LPC_NCTS")
+  (net 623 "/Reform 2 Power/LPC_NUSBCON")
+  (net 624 "/Reform 2 Power/LPC_SCLKb")
+  (net 625 "/Reform 2 Power/LPC_MOSI1a")
+  (net 626 "/Reform 2 Power/LPC_UVBUS")
+  (net 627 "/Reform 2 Power/LPC_TXDc")
+  (net 628 "/Reform 2 Power/LPC_RXDc")
+  (net 629 "/Reform 2 Power/LPC_SSEL0")
+  (net 630 "Net-(U18-Pad9)")
+  (net 631 "/Reform 2 Power/LPC_NRESET")
+  (net 632 "/Reform 2 Power/LPC_NDTR")
+  (net 633 "Net-(U18-Pad1)")
+  (net 634 "Net-(J10-Pad75)")
+  (net 635 "Net-(J10-Pad69)")
+  (net 636 "/Reform 2 PCIe/M2_SUSCLK")
+  (net 637 "Net-(J10-Pad67)")
+  (net 638 "Net-(J10-Pad66)")
+  (net 639 "Net-(J10-Pad65)")
+  (net 640 "Net-(J10-Pad64)")
+  (net 641 "Net-(J10-Pad63)")
+  (net 642 "Net-(J10-Pad62)")
+  (net 643 "Net-(J10-Pad61)")
+  (net 644 "Net-(J10-Pad60)")
+  (net 645 "Net-(J10-Pad59)")
+  (net 646 "Net-(J10-Pad58)")
+  (net 647 "Net-(J10-Pad56)")
+  (net 648 "/Reform 2 PCIe/M2_NPEWAKE")
+  (net 649 "Net-(J10-Pad52)")
+  (net 650 "Net-(J10-Pad48)")
+  (net 651 "Net-(J10-Pad46)")
+  (net 652 "Net-(J10-Pad44)")
+  (net 653 "Net-(J10-Pad42)")
+  (net 654 "Net-(J10-Pad40)")
+  (net 655 "/Reform 2 PCIe/M2_DEVSLP")
+  (net 656 "Net-(J10-Pad37)")
+  (net 657 "Net-(J10-Pad36)")
+  (net 658 "Net-(J10-Pad35)")
+  (net 659 "Net-(J10-Pad34)")
+  (net 660 "Net-(J10-Pad32)")
+  (net 661 "Net-(J10-Pad31)")
+  (net 662 "Net-(J10-Pad30)")
+  (net 663 "Net-(J10-Pad29)")
+  (net 664 "Net-(J10-Pad28)")
+  (net 665 "Net-(J10-Pad26)")
+  (net 666 "Net-(J10-Pad25)")
+  (net 667 "Net-(J10-Pad24)")
+  (net 668 "Net-(J10-Pad23)")
+  (net 669 "Net-(J10-Pad22)")
+  (net 670 "Net-(J10-Pad21)")
+  (net 671 "Net-(J10-Pad20)")
+  (net 672 "Net-(J10-Pad11)")
+  (net 673 "/Reform 2 PCIe/M2_DAS_DSS")
+  (net 674 BAT1+)
+  (net 675 BAT2+)
+  (net 676 BAT3+)
+  (net 677 BAT4+)
+  (net 678 BAT5+)
+  (net 679 BAT6+)
+  (net 680 BAT7+)
+  (net 681 BAT8+)
+  (net 682 "Net-(J14-Pad4)")
+  (net 683 "Net-(J14-Pad3)")
+  (net 684 "Net-(J14-Pad2)")
+  (net 685 "Net-(J14-Pad1)")
 
   (net_class Default "This is the default net class."
     (clearance 0.2)
@@ -840,6 +844,14 @@
     (add_net "/Reform 2 Power/LPC_UFTOGG")
     (add_net "/Reform 2 Power/LPC_UVBUS")
     (add_net "/Reform 2 Power/VREG")
+    (add_net BAT1+)
+    (add_net BAT2+)
+    (add_net BAT3+)
+    (add_net BAT4+)
+    (add_net BAT5+)
+    (add_net BAT6+)
+    (add_net BAT7+)
+    (add_net BAT8+)
     (add_net BATPWR)
     (add_net BMON_CS)
     (add_net BMON_SCK)
@@ -891,14 +903,6 @@
     (add_net HDMI_I2C)
     (add_net HDMI_SCL)
     (add_net HDMI_SDA)
-    (add_net "Net-(BT1-Pad1)")
-    (add_net "Net-(BT1-Pad2)")
-    (add_net "Net-(BT2-Pad2)")
-    (add_net "Net-(BT3-Pad2)")
-    (add_net "Net-(BT4-Pad2)")
-    (add_net "Net-(BT5-Pad2)")
-    (add_net "Net-(BT6-Pad2)")
-    (add_net "Net-(BT7-Pad2)")
     (add_net "Net-(C1-Pad1)")
     (add_net "Net-(C1-Pad2)")
     (add_net "Net-(C16-Pad1)")
@@ -1003,6 +1007,10 @@
     (add_net "Net-(J10-Pad75)")
     (add_net "Net-(J10-Pad8)")
     (add_net "Net-(J10-Pad9)")
+    (add_net "Net-(J14-Pad1)")
+    (add_net "Net-(J14-Pad2)")
+    (add_net "Net-(J14-Pad3)")
+    (add_net "Net-(J14-Pad4)")
     (add_net "Net-(J2-Pad1)")
     (add_net "Net-(J2-Pad24)")
     (add_net "Net-(J2-Pad25)")
@@ -1471,8 +1479,771 @@
     (add_net USB_PWR)
   )
 
-  (module footprints:label-mpcie (layer F.Cu) (tedit 0) (tstamp 5D18055F)
-    (at 131.5 60)
+  (module MountingHole:MountingHole_3.2mm_M3_DIN965_Pad locked (layer F.Cu) (tedit 56D1B4CB) (tstamp 5D1BA2A1)
+    (at 142 90)
+    (descr "Mounting Hole 3.2mm, M3, DIN965")
+    (tags "mounting hole 3.2mm m3 din965")
+    (path /5D06AC46/610E8506)
+    (attr virtual)
+    (fp_text reference H3 (at 0 -3.8) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value NGFF-Mount1 (at 0 3.8) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask)
+      (net 40 GND))
+  )
+
+  (module MountingHole:MountingHole_3.2mm_M3_DIN965_Pad locked (layer F.Cu) (tedit 56D1B4CB) (tstamp 5D1BA293)
+    (at 142 108)
+    (descr "Mounting Hole 3.2mm, M3, DIN965")
+    (tags "mounting hole 3.2mm m3 din965")
+    (path /5D06AC46/610E8506)
+    (attr virtual)
+    (fp_text reference H2 (at 0 -3.8) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value NGFF-Mount1 (at 0 3.8) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
+    (pad 1 thru_hole circle (at 0 0) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask)
+      (net 40 GND))
+  )
+
+  (module Connector_PinHeader_2.00mm:PinHeader_1x04_P2.00mm_Horizontal (layer F.Cu) (tedit 59FED667) (tstamp 5D1F5C1C)
+    (at 175.5 123.5)
+    (descr "Through hole angled pin header, 1x04, 2.00mm pitch, 4.2mm pin length, single row")
+    (tags "Through hole angled pin header THT 1x04 2.00mm single row")
+    (path /5D06A2FD/5DBC25D6)
+    (fp_text reference J14 (at 3.1 -2) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value USB_INT2 (at 3.1 8) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 2.25 3 90) (layer F.Fab)
+      (effects (font (size 0.9 0.9) (thickness 0.135)))
+    )
+    (fp_line (start 7.7 -1.5) (end -1.5 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 7.7 7.5) (end 7.7 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.5 7.5) (end 7.7 7.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.5 -1.5) (end -1.5 7.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1 -1) (end 0 -1) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1 0) (end -1 -1) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.882114 6.31) (end 1.44 6.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.882114 5.69) (end 1.44 5.69) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.26 6.31) (end 3.06 6.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.26 5.69) (end 7.26 6.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 5.69) (end 7.26 5.69) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.44 5) (end 3.06 5) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.882114 4.31) (end 1.44 4.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.882114 3.69) (end 1.44 3.69) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.26 4.31) (end 3.06 4.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.26 3.69) (end 7.26 4.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 3.69) (end 7.26 3.69) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.44 3) (end 3.06 3) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.882114 2.31) (end 1.44 2.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.882114 1.69) (end 1.44 1.69) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.26 2.31) (end 3.06 2.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.26 1.69) (end 7.26 2.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 1.69) (end 7.26 1.69) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.44 1) (end 3.06 1) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.935 0.31) (end 1.44 0.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.935 -0.31) (end 1.44 -0.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 0.23) (end 7.26 0.23) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 0.11) (end 7.26 0.11) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 -0.01) (end 7.26 -0.01) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 -0.13) (end 7.26 -0.13) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 -0.25) (end 7.26 -0.25) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.26 0.31) (end 3.06 0.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.26 -0.31) (end 7.26 0.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 -0.31) (end 7.26 -0.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 -1.06) (end 1.44 -1.06) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.06 7.06) (end 3.06 -1.06) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.44 7.06) (end 3.06 7.06) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.44 -1.06) (end 1.44 7.06) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3 6.25) (end 7.2 6.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.2 5.75) (end 7.2 6.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 3 5.75) (end 7.2 5.75) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.25 6.25) (end 1.5 6.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.25 5.75) (end -0.25 6.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.25 5.75) (end 1.5 5.75) (layer F.Fab) (width 0.1))
+    (fp_line (start 3 4.25) (end 7.2 4.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.2 3.75) (end 7.2 4.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 3 3.75) (end 7.2 3.75) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.25 4.25) (end 1.5 4.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.25 3.75) (end -0.25 4.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.25 3.75) (end 1.5 3.75) (layer F.Fab) (width 0.1))
+    (fp_line (start 3 2.25) (end 7.2 2.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.2 1.75) (end 7.2 2.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 3 1.75) (end 7.2 1.75) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.25 2.25) (end 1.5 2.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.25 1.75) (end -0.25 2.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.25 1.75) (end 1.5 1.75) (layer F.Fab) (width 0.1))
+    (fp_line (start 3 0.25) (end 7.2 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.2 -0.25) (end 7.2 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 3 -0.25) (end 7.2 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.25 0.25) (end 1.5 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.25 -0.25) (end -0.25 0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.25 -0.25) (end 1.5 -0.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 -0.625) (end 1.875 -1) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.5 7) (end 1.5 -0.625) (layer F.Fab) (width 0.1))
+    (fp_line (start 3 7) (end 1.5 7) (layer F.Fab) (width 0.1))
+    (fp_line (start 3 -1) (end 3 7) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.875 -1) (end 3 -1) (layer F.Fab) (width 0.1))
+    (pad 4 thru_hole oval (at 0 6) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
+      (net 682 "Net-(J14-Pad4)"))
+    (pad 3 thru_hole oval (at 0 4) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
+      (net 683 "Net-(J14-Pad3)"))
+    (pad 2 thru_hole oval (at 0 2) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
+      (net 684 "Net-(J14-Pad2)"))
+    (pad 1 thru_hole rect (at 0 0) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
+      (net 685 "Net-(J14-Pad1)"))
+    (model ${KISYS3DMOD}/Connector_PinHeader_2.00mm.3dshapes/PinHeader_1x04_P2.00mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module MountingHole:MountingHole_2.2mm_M2_DIN965_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 5D1F5769)
+    (at 313.55 130.48)
+    (descr "Mounting Hole 2.2mm, M2, DIN965")
+    (tags "mounting hole 2.2mm m2 din965")
+    (path /5DBF5615)
+    (attr virtual)
+    (fp_text reference H8 (at 0 -2.9) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MountingHole_Pad (at 0 2.9) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 2.15 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 1.9 0) (layer Cmts.User) (width 0.15))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 3.8 3.8) (drill 2.2) (layers *.Cu *.Mask)
+      (net 40 GND))
+  )
+
+  (module MountingHole:MountingHole_2.2mm_M2_DIN965_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 5D1F5761)
+    (at 42.04 130.48)
+    (descr "Mounting Hole 2.2mm, M2, DIN965")
+    (tags "mounting hole 2.2mm m2 din965")
+    (path /5DBF5601)
+    (attr virtual)
+    (fp_text reference H7 (at 0 -2.9) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MountingHole_Pad (at 0 2.9) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 2.15 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 1.9 0) (layer Cmts.User) (width 0.15))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 3.8 3.8) (drill 2.2) (layers *.Cu *.Mask)
+      (net 40 GND))
+  )
+
+  (module MountingHole:MountingHole_2.2mm_M2_DIN965_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 5D1F5759)
+    (at 313.55 43.94)
+    (descr "Mounting Hole 2.2mm, M2, DIN965")
+    (tags "mounting hole 2.2mm m2 din965")
+    (path /5DBE65C1)
+    (attr virtual)
+    (fp_text reference H6 (at 0 -2.9) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MountingHole_Pad (at 0 2.9) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 2.15 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 1.9 0) (layer Cmts.User) (width 0.15))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 3.8 3.8) (drill 2.2) (layers *.Cu *.Mask)
+      (net 40 GND))
+  )
+
+  (module MountingHole:MountingHole_2.2mm_M2_DIN965_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 5D1FEBCA)
+    (at 42.04 43.94)
+    (descr "Mounting Hole 2.2mm, M2, DIN965")
+    (tags "mounting hole 2.2mm m2 din965")
+    (path /5DBC8BC3)
+    (attr virtual)
+    (fp_text reference H5 (at 0 -2.9) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value MountingHole_Pad (at 0 2.9) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 2.15 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 1.9 0) (layer Cmts.User) (width 0.15))
+    (fp_text user %R (at 0.3 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 3.8 3.8) (drill 2.2) (layers *.Cu *.Mask)
+      (net 40 GND))
+  )
+
+  (module Connector_Molex:Molex_KK-254_AE-6410-05A_1x05_P2.54mm_Vertical (layer F.Cu) (tedit 5B78013E) (tstamp 5D1DA852)
+    (at 99.5 127.5 180)
+    (descr "Molex KK-254 Interconnect System, old/engineering part number: AE-6410-05A example for new part number: 22-27-2051, 5 Pins (http://www.molex.com/pdm_docs/sd/022272021_sd.pdf), generated with kicad-footprint-generator")
+    (tags "connector Molex KK-254 side entry")
+    (path /5CC81028/5D7D1916)
+    (fp_text reference J13 (at 5.08 -4.12) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value BATCON2 (at 5.08 4.08) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 5.08 -2.22) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 11.93 -3.42) (end -1.77 -3.42) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 11.93 3.38) (end 11.93 -3.42) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.77 3.38) (end 11.93 3.38) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.77 -3.42) (end -1.77 3.38) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 10.96 -2.43) (end 10.96 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.36 -2.43) (end 10.96 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.36 -3.03) (end 9.36 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.42 -2.43) (end 8.42 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.82 -2.43) (end 8.42 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.82 -3.03) (end 6.82 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.88 -2.43) (end 5.88 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.28 -2.43) (end 5.88 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.28 -3.03) (end 4.28 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.34 -2.43) (end 3.34 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.74 -2.43) (end 3.34 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.74 -3.03) (end 1.74 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 -2.43) (end 0.8 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.8 -2.43) (end 0.8 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.8 -3.03) (end -0.8 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.91 2.99) (end 9.91 1.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.25 2.99) (end 0.25 1.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.91 1.46) (end 10.16 1.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.25 1.46) (end 9.91 1.46) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 1.99) (end 0.25 1.46) (layer F.SilkS) (width 0.12))
+    (fp_line (start 10.16 1.99) (end 10.16 2.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 1.99) (end 10.16 1.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 2.99) (end 0 1.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.562893 0) (end -1.27 0.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 -0.5) (end -0.562893 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.67 -2) (end -1.67 2) (layer F.SilkS) (width 0.12))
+    (fp_line (start 11.54 -3.03) (end -1.38 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 11.54 2.99) (end 11.54 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.38 2.99) (end 11.54 2.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.38 -3.03) (end -1.38 2.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 11.43 -2.92) (end -1.27 -2.92) (layer F.Fab) (width 0.1))
+    (fp_line (start 11.43 2.88) (end 11.43 -2.92) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 2.88) (end 11.43 2.88) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 -2.92) (end -1.27 2.88) (layer F.Fab) (width 0.1))
+    (pad 5 thru_hole oval (at 10.16 0 180) (size 1.74 2.2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 40 GND))
+    (pad 4 thru_hole oval (at 7.62 0 180) (size 1.74 2.2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 681 BAT8+))
+    (pad 3 thru_hole oval (at 5.08 0 180) (size 1.74 2.2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 680 BAT7+))
+    (pad 2 thru_hole oval (at 2.54 0 180) (size 1.74 2.2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 679 BAT6+))
+    (pad 1 thru_hole roundrect (at 0 0 180) (size 1.74 2.2) (drill 1.2) (layers *.Cu *.Mask) (roundrect_rratio 0.143678)
+      (net 678 BAT5+))
+    (model ${KISYS3DMOD}/Connector_Molex.3dshapes/Molex_KK-254_AE-6410-05A_1x05_P2.54mm_Vertical.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Connector_Molex:Molex_KK-254_AE-6410-05A_1x05_P2.54mm_Vertical (layer F.Cu) (tedit 5B78013E) (tstamp 5D1DA822)
+    (at 259 127.5 180)
+    (descr "Molex KK-254 Interconnect System, old/engineering part number: AE-6410-05A example for new part number: 22-27-2051, 5 Pins (http://www.molex.com/pdm_docs/sd/022272021_sd.pdf), generated with kicad-footprint-generator")
+    (tags "connector Molex KK-254 side entry")
+    (path /5CC81028/5D780B86)
+    (fp_text reference J12 (at 5.08 -4.12) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value BATCON1 (at 5.08 4.08) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 5.08 -2.22) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 11.93 -3.42) (end -1.77 -3.42) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 11.93 3.38) (end 11.93 -3.42) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.77 3.38) (end 11.93 3.38) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.77 -3.42) (end -1.77 3.38) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 10.96 -2.43) (end 10.96 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.36 -2.43) (end 10.96 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.36 -3.03) (end 9.36 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.42 -2.43) (end 8.42 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.82 -2.43) (end 8.42 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.82 -3.03) (end 6.82 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.88 -2.43) (end 5.88 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.28 -2.43) (end 5.88 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.28 -3.03) (end 4.28 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.34 -2.43) (end 3.34 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.74 -2.43) (end 3.34 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.74 -3.03) (end 1.74 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 -2.43) (end 0.8 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.8 -2.43) (end 0.8 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.8 -3.03) (end -0.8 -2.43) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.91 2.99) (end 9.91 1.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.25 2.99) (end 0.25 1.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 9.91 1.46) (end 10.16 1.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.25 1.46) (end 9.91 1.46) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 1.99) (end 0.25 1.46) (layer F.SilkS) (width 0.12))
+    (fp_line (start 10.16 1.99) (end 10.16 2.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 1.99) (end 10.16 1.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0 2.99) (end 0 1.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.562893 0) (end -1.27 0.5) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 -0.5) (end -0.562893 0) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.67 -2) (end -1.67 2) (layer F.SilkS) (width 0.12))
+    (fp_line (start 11.54 -3.03) (end -1.38 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start 11.54 2.99) (end 11.54 -3.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.38 2.99) (end 11.54 2.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.38 -3.03) (end -1.38 2.99) (layer F.SilkS) (width 0.12))
+    (fp_line (start 11.43 -2.92) (end -1.27 -2.92) (layer F.Fab) (width 0.1))
+    (fp_line (start 11.43 2.88) (end 11.43 -2.92) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 2.88) (end 11.43 2.88) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 -2.92) (end -1.27 2.88) (layer F.Fab) (width 0.1))
+    (pad 5 thru_hole oval (at 10.16 0 180) (size 1.74 2.2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 678 BAT5+))
+    (pad 4 thru_hole oval (at 7.62 0 180) (size 1.74 2.2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 677 BAT4+))
+    (pad 3 thru_hole oval (at 5.08 0 180) (size 1.74 2.2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 676 BAT3+))
+    (pad 2 thru_hole oval (at 2.54 0 180) (size 1.74 2.2) (drill 1.2) (layers *.Cu *.Mask)
+      (net 675 BAT2+))
+    (pad 1 thru_hole roundrect (at 0 0 180) (size 1.74 2.2) (drill 1.2) (layers *.Cu *.Mask) (roundrect_rratio 0.143678)
+      (net 674 BAT1+))
+    (model ${KISYS3DMOD}/Connector_Molex.3dshapes/Molex_KK-254_AE-6410-05A_1x05_P2.54mm_Vertical.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Button_Switch_SMD:SW_Push_1P1T_NO_CK_KMR2 (layer F.Cu) (tedit 5A02FC95) (tstamp 5D14CFCE)
+    (at 214.5 77 90)
+    (descr "CK components KMR2 tactile switch http://www.ckswitches.com/media/1479/kmr2.pdf")
+    (tags "tactile switch kmr2")
+    (path /5CC81028/5E8EBB68)
+    (attr smd)
+    (fp_text reference SW2 (at 0 -2.45 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value SW_Push (at 0 2.55 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -2.2 0.05) (end -2.2 -0.05) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.2 -1.55) (end -2.2 -1.55) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.2 1.55) (end 2.2 1.55) (layer F.SilkS) (width 0.12))
+    (fp_circle (center 0 0) (end 0 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.8 1.8) (end -2.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.8 1.8) (end -2.8 1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.8 -1.8) (end 2.8 1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.8 -1.8) (end 2.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.2 0.05) (end 2.2 -0.05) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.1 1.4) (end -2.1 -1.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.1 1.4) (end -2.1 1.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.1 -1.4) (end 2.1 1.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.1 -1.4) (end 2.1 -1.4) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 -2.45 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 smd rect (at 2.05 0.8 180) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
+      (net 631 "/Reform 2 Power/LPC_NRESET"))
+    (pad 1 smd rect (at 2.05 -0.8 180) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 2 smd rect (at -2.05 0.8 180) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
+      (net 631 "/Reform 2 Power/LPC_NRESET"))
+    (pad 1 smd rect (at -2.05 -0.8 180) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_Push_1P1T_NO_CK_KMR2.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CFAA)
+    (at 74.5 69 90)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags resistor)
+    (path /5D06A7B6/60F2545C)
+    (attr smd)
+    (fp_text reference R77 (at 0 -1.43 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 0 (at 0 1.43 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+    )
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 589 "Net-(R77-Pad2)"))
+    (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 40 GND))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF94)
+    (at 222.5 90.5 90)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags resistor)
+    (path /5CC81028/5FEFDBB8)
+    (attr smd)
+    (fp_text reference R76 (at 0 -1.43 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 0 (at 0 1.43 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+    )
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 588 "/Reform 2 Power/LPC_SSEL1"))
+    (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 340 BMON_CS))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF83)
+    (at 176.9 173.48)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags resistor)
+    (path /5CC81028/5FEFD6BC)
+    (attr smd)
+    (fp_text reference R75 (at 0 -1.43) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 0 (at 0 1.43) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+    )
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 587 "/Reform 2 Power/LPC_MOSI1b"))
+    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 341 BMON_SDO))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF72)
+    (at 175.73 175.23)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags resistor)
+    (path /5CC81028/5FEFD58C)
+    (attr smd)
+    (fp_text reference R74 (at 0 -1.43) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 0 (at 0 1.43) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+    )
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 586 "/Reform 2 Power/LPC_MISO1b"))
+    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 342 BMON_SDI))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF61)
+    (at 177 141)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags resistor)
+    (path /5CC81028/5FEFD1B6)
+    (attr smd)
+    (fp_text reference R73 (at 0 -1.43) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 0 (at 0 1.43) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+    )
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 585 "/Reform 2 Power/LPC_SCK1b"))
+    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 343 BMON_SCK))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF50)
+    (at 180.5 141)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags resistor)
+    (path /5CC81028/5F3A0059)
+    (attr smd)
+    (fp_text reference R72 (at 0 -1.43) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 33 (at 0 1.43) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+    )
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 584 "Net-(R72-Pad2)"))
+    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 570 "Net-(J8-Pad2)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF3F)
+    (at 174.45 173.48)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags resistor)
+    (path /5CC81028/5F539611)
+    (attr smd)
+    (fp_text reference R71 (at 0 -1.43) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1.5k (at 0 1.43) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+    )
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 567 "Net-(J8-Pad3)"))
+    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 228 +3V3))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF2E)
+    (at 184 141)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags resistor)
+    (path /5CC81028/5F39F610)
+    (attr smd)
+    (fp_text reference R70 (at 0 -1.43) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 33 (at 0 1.43) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+    )
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 583 "Net-(R70-Pad2)"))
+    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 567 "Net-(J8-Pad3)"))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF1D)
+    (at 219.5 90)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags resistor)
+    (path /5CC81028/609DDFBB)
+    (attr smd)
+    (fp_text reference R69 (at 0 -1.43) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1k (at 0 1.43) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+    )
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 582 CHG_SCL))
+    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 228 +3V3))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD4C4)
+    (at 64.5 63.5 180)
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
+    (tags resistor)
+    (path /5CC81028/60A2BECF)
+    (attr smd)
+    (fp_text reference R68 (at 0 -1.43) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1k (at 0 1.43) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.4 0.4) (thickness 0.06)))
+    )
+    (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.48 -0.73) (end 1.48 0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 -0.73) (end 1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.48 0.73) (end -1.48 -0.73) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
+    (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 581 CHG_SDA))
+    (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 228 +3V3))
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module footprints:label-mpcie (layer F.Cu) (tedit 0) (tstamp 5D1CCAC7)
+    (at 141.5 67.5)
     (path /611177F8)
     (fp_text reference H4 (at 0 0) (layer F.SilkS) hide
       (effects (font (size 1.524 1.524) (thickness 0.3)))
@@ -1559,8 +2330,8 @@
       (xy -0.877374 -0.654798)) (layer F.SilkS) (width 0.01))
   )
 
-  (module footprints:label-mpcie (layer F.Cu) (tedit 0) (tstamp 5D180559)
-    (at 101.5 60)
+  (module footprints:label-mpcie (layer F.Cu) (tedit 0) (tstamp 5D1CCBC0)
+    (at 111.5 67.5)
     (path /611164C9)
     (fp_text reference H3 (at 0 0) (layer F.SilkS) hide
       (effects (font (size 1.524 1.524) (thickness 0.3)))
@@ -1648,7 +2419,7 @@
   )
 
   (module reform2-motherboard:mntreform (layer F.Cu) (tedit 0) (tstamp 5D180553)
-    (at 176 48)
+    (at 247.5 48.5)
     (path /61115EAF)
     (fp_text reference H2 (at 0 0) (layer F.SilkS) hide
       (effects (font (size 1.524 1.524) (thickness 0.3)))
@@ -1775,13 +2546,13 @@
   )
 
   (module footprints:TE_1775059-1 (layer F.Cu) (tedit 5D128F14) (tstamp 5D0637EB)
-    (at 48.5 87 180)
+    (at 307 98)
     (path /5D0CA3EB/5D0E6993)
     (attr smd)
     (fp_text reference J3 (at -6.8 12.5) (layer F.SilkS)
       (effects (font (size 1.00161 1.00161) (thickness 0.05)))
     )
-    (fp_text value SD_Card (at -19.0871 28.3829) (layer F.SilkS)
+    (fp_text value SD_Card (at -5.5 17) (layer F.SilkS)
       (effects (font (size 1.00063 1.00063) (thickness 0.05)))
     )
     (fp_circle (center -21.26 18.9) (end -21.16 18.9) (layer Eco2.User) (width 0.2))
@@ -1801,31 +2572,31 @@
     (fp_line (start 8.9 27.15) (end -21.7 27.15) (layer Eco2.User) (width 0.127))
     (fp_line (start 8.9 -2.1) (end 8.9 27.15) (layer Eco2.User) (width 0.127))
     (fp_line (start -21.7 -2.1) (end 8.9 -2.1) (layer Eco2.User) (width 0.127))
-    (pad SW smd rect (at -21.3 -1.03 180) (size 1.4 0.73) (layers F.Cu F.Paste F.Mask))
-    (pad D_SW smd rect (at -21.3 -0.07 180) (size 1.4 0.73) (layers F.Cu F.Paste F.Mask))
-    (pad 8 smd rect (at -21.4 2.3 180) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
+    (pad SW smd rect (at -21.3 -1.03) (size 1.4 0.73) (layers F.Cu F.Paste F.Mask))
+    (pad D_SW smd rect (at -21.3 -0.07) (size 1.4 0.73) (layers F.Cu F.Paste F.Mask))
+    (pad 8 smd rect (at -21.4 2.3) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
       (net 9 SD2_DATA1))
-    (pad 7 smd rect (at -21.4 4 180) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
+    (pad 7 smd rect (at -21.4 4) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
       (net 10 SD2_DATA0))
-    (pad 6 smd rect (at -21.4 6.425 180) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
+    (pad 6 smd rect (at -21.4 6.425) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
-    (pad 5 smd rect (at -21.4 8.925 180) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
+    (pad 5 smd rect (at -21.4 8.925) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
       (net 11 SD2_CLK))
-    (pad 4 smd rect (at -21.4 11.425 180) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
-      (net 236 +3V3))
-    (pad 3 smd rect (at -21.4 13.925 180) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
+    (pad 4 smd rect (at -21.4 11.425) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
+      (net 228 +3V3))
+    (pad 3 smd rect (at -21.4 13.925) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
-    (pad 2 smd rect (at -21.4 16.425 180) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at -21.4 16.425) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
       (net 12 SD2_CMD))
-    (pad 1 smd rect (at -21.4 18.925 180) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -21.4 18.925) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
       (net 13 SD2_DATA3))
-    (pad 9 smd rect (at -21.4 21.425 180) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
+    (pad 9 smd rect (at -21.4 21.425) (size 1.2 1.2) (layers F.Cu F.Paste F.Mask)
       (net 14 SD2_DATA2))
-    (pad PEG2 smd rect (at 7.1 25.92 180) (size 2.8 1.8) (layers F.Cu F.Paste F.Mask))
-    (pad P2 thru_hole circle (at 5 26.2 180) (size 1.508 1.508) (drill 1) (layers *.Cu *.Mask))
-    (pad PEG1 smd rect (at 7.1 -1.52 180) (size 2.8 1.8) (layers F.Cu F.Paste F.Mask))
-    (pad P_SW smd rect (at -2.3 -1.25 180) (size 1.8 1.45) (layers F.Cu F.Paste F.Mask))
-    (pad P1 thru_hole circle (at 0 0 180) (size 1.8 1.8) (drill 1.2) (layers *.Cu *.Mask))
+    (pad PEG2 smd rect (at 7.1 25.92) (size 2.8 1.8) (layers F.Cu F.Paste F.Mask))
+    (pad P2 thru_hole circle (at 5 26.2) (size 1.508 1.508) (drill 1) (layers *.Cu *.Mask))
+    (pad PEG1 smd rect (at 7.1 -1.52) (size 2.8 1.8) (layers F.Cu F.Paste F.Mask))
+    (pad P_SW smd rect (at -2.3 -1.25) (size 1.8 1.45) (layers F.Cu F.Paste F.Mask))
+    (pad P1 thru_hole circle (at 0 0) (size 1.8 1.8) (drill 1.2) (layers *.Cu *.Mask))
     (model ${KIPRJMOD}/3d-models/c-1775059-1-d-3d.stp
       (offset (xyz 8.5 -12.5 1.4))
       (scale (xyz 1 1 1))
@@ -1833,8 +2604,8 @@
     )
   )
 
-  (module footprints:MOLEX_48099-5701 (layer F.Cu) (tedit 5AE8DC98) (tstamp 5D1649E6)
-    (at 102.15 97.9)
+  (module footprints:MOLEX_48099-5701 (layer F.Cu) (tedit 5AE8DC98) (tstamp 5D1CCC29)
+    (at 111.15 97.4)
     (path /5D06AC46/610F1B47)
     (attr smd)
     (fp_text reference J11 (at -12.5477 -6.25377) (layer F.SilkS)
@@ -1872,8 +2643,8 @@
       (net 40 GND))
   )
 
-  (module MountingHole:MountingHole_3.2mm_M3_DIN965_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 5D1645C1)
-    (at 132 127)
+  (module MountingHole:MountingHole_3.2mm_M3_DIN965_Pad locked (layer F.Cu) (tedit 56D1B4CB) (tstamp 5D1BA553)
+    (at 142 128)
     (descr "Mounting Hole 3.2mm, M3, DIN965")
     (tags "mounting hole 3.2mm m3 din965")
     (path /5D06AC46/610E8506)
@@ -1893,8 +2664,8 @@
       (net 40 GND))
   )
 
-  (module footprints:TE_1-2199230-5 (layer F.Cu) (tedit 5D127F88) (tstamp 5D14C3A6)
-    (at 131.5 45.5 180)
+  (module footprints:TE_1-2199230-5 locked (layer F.Cu) (tedit 5D127F88) (tstamp 5D1CCCB8)
+    (at 142 48)
     (path /5D06AC46/610031F1)
     (attr smd)
     (fp_text reference J10 (at 0 -7.5) (layer F.SilkS)
@@ -1920,146 +2691,146 @@
     (fp_line (start 10.95 -5.25) (end 10.95 2.5) (layer Eco2.User) (width 0.127))
     (fp_line (start -10.95 -5.25) (end 10.95 -5.25) (layer Eco2.User) (width 0.127))
     (fp_line (start -10.95 2.5) (end -10.95 -5.25) (layer Eco2.User) (width 0.127))
-    (pad S2 smd rect (at 10.35 -4.5 180) (size 1.2 2.75) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad S1 smd rect (at -10.35 -4.5 180) (size 1.2 2.75) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 75 smd rect (at 9.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 642 "Net-(J10-Pad75)"))
-    (pad 74 smd rect (at 9 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 573 "Net-(C58-Pad1)"))
-    (pad 73 smd rect (at 8.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 72 smd rect (at 8.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 573 "Net-(C58-Pad1)"))
-    (pad 71 smd rect (at 8.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 70 smd rect (at 8 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 573 "Net-(C58-Pad1)"))
-    (pad 69 smd rect (at 7.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 643 "Net-(J10-Pad69)"))
-    (pad 68 smd rect (at 7.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 644 "/Reform 2 PCIe/M2_SUSCLK"))
-    (pad 67 smd rect (at 7.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 645 "Net-(J10-Pad67)"))
-    (pad 66 smd rect (at 5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 646 "Net-(J10-Pad66)"))
-    (pad 65 smd rect (at 4.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 647 "Net-(J10-Pad65)"))
-    (pad 64 smd rect (at 4.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 648 "Net-(J10-Pad64)"))
-    (pad 63 smd rect (at 4.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 649 "Net-(J10-Pad63)"))
-    (pad 62 smd rect (at 4 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 650 "Net-(J10-Pad62)"))
-    (pad 61 smd rect (at 3.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 651 "Net-(J10-Pad61)"))
-    (pad 60 smd rect (at 3.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 652 "Net-(J10-Pad60)"))
-    (pad 59 smd rect (at 3.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 653 "Net-(J10-Pad59)"))
-    (pad 58 smd rect (at 3 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 654 "Net-(J10-Pad58)"))
-    (pad 57 smd rect (at 2.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 56 smd rect (at 2.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 655 "Net-(J10-Pad56)"))
-    (pad 55 smd rect (at 2.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 492 PCIE2_CLK_P))
-    (pad 54 smd rect (at 2 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 656 "/Reform 2 PCIe/M2_NPEWAKE"))
-    (pad 53 smd rect (at 1.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 491 PCIE2_CLK_N))
-    (pad 52 smd rect (at 1.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 657 "Net-(J10-Pad52)"))
-    (pad 51 smd rect (at 1.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 50 smd rect (at 1 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 524 PCIE_RESETn))
-    (pad 49 smd rect (at 0.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 495 PCIE2_TX_P))
-    (pad 48 smd rect (at 0.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 658 "Net-(J10-Pad48)"))
-    (pad 47 smd rect (at 0.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 496 PCIE2_TX_N))
-    (pad 46 smd rect (at 0 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 659 "Net-(J10-Pad46)"))
-    (pad 45 smd rect (at -0.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 44 smd rect (at -0.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 660 "Net-(J10-Pad44)"))
-    (pad 43 smd rect (at -0.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 493 PCIE2_RX_P))
-    (pad 42 smd rect (at -1 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 661 "Net-(J10-Pad42)"))
-    (pad 41 smd rect (at -1.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 494 PCIE2_RX_N))
-    (pad 40 smd rect (at -1.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 662 "Net-(J10-Pad40)"))
-    (pad 39 smd rect (at -1.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 38 smd rect (at -2 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 663 "/Reform 2 PCIe/M2_DEVSLP"))
-    (pad 37 smd rect (at -2.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 664 "Net-(J10-Pad37)"))
-    (pad 36 smd rect (at -2.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 665 "Net-(J10-Pad36)"))
-    (pad 35 smd rect (at -2.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 666 "Net-(J10-Pad35)"))
-    (pad 34 smd rect (at -3 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 667 "Net-(J10-Pad34)"))
-    (pad 33 smd rect (at -3.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 32 smd rect (at -3.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 668 "Net-(J10-Pad32)"))
-    (pad 31 smd rect (at -3.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 669 "Net-(J10-Pad31)"))
-    (pad 30 smd rect (at -4 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 670 "Net-(J10-Pad30)"))
-    (pad 29 smd rect (at -4.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 671 "Net-(J10-Pad29)"))
-    (pad 28 smd rect (at -4.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 672 "Net-(J10-Pad28)"))
-    (pad 27 smd rect (at -4.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 26 smd rect (at -5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 673 "Net-(J10-Pad26)"))
-    (pad 25 smd rect (at -5.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 674 "Net-(J10-Pad25)"))
-    (pad 24 smd rect (at -5.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 675 "Net-(J10-Pad24)"))
-    (pad 23 smd rect (at -5.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 676 "Net-(J10-Pad23)"))
-    (pad 22 smd rect (at -6 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 677 "Net-(J10-Pad22)"))
-    (pad 21 smd rect (at -6.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 678 "Net-(J10-Pad21)"))
-    (pad 20 smd rect (at -6.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 679 "Net-(J10-Pad20)"))
-    (pad 11 smd rect (at -6.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 680 "Net-(J10-Pad11)"))
-    (pad 10 smd rect (at -7 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 681 "/Reform 2 PCIe/M2_DAS_DSS"))
-    (pad 9 smd rect (at -7.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 585 "Net-(J10-Pad9)"))
-    (pad 8 smd rect (at -7.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 588 "Net-(J10-Pad8)"))
-    (pad 7 smd rect (at -7.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 587 "Net-(J10-Pad7)"))
-    (pad 6 smd rect (at -8 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 586 "Net-(J10-Pad6)"))
-    (pad 5 smd rect (at -8.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 584 "Net-(J10-Pad5)"))
-    (pad 4 smd rect (at -8.5 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 573 "Net-(C58-Pad1)"))
-    (pad 3 smd rect (at -8.75 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 2 smd rect (at -9 2.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 573 "Net-(C58-Pad1)"))
-    (pad 1 smd rect (at -9.25 -5.275 180) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
-      (net 583 "Net-(J10-Pad1)"))
-    (pad Hole np_thru_hole circle (at 10 0 180) (size 1.6 1.6) (drill 1.6) (layers *.Cu *.Mask F.SilkS))
-    (pad Hole np_thru_hole circle (at -10 0 180) (size 1.1 1.1) (drill 1.1) (layers *.Cu *.Mask F.SilkS))
+    (pad S2 smd rect (at 10.35 -4.5) (size 1.2 2.75) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad S1 smd rect (at -10.35 -4.5) (size 1.2 2.75) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 75 smd rect (at 9.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 634 "Net-(J10-Pad75)"))
+    (pad 74 smd rect (at 9 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 565 "Net-(C58-Pad1)"))
+    (pad 73 smd rect (at 8.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 72 smd rect (at 8.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 565 "Net-(C58-Pad1)"))
+    (pad 71 smd rect (at 8.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 70 smd rect (at 8 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 565 "Net-(C58-Pad1)"))
+    (pad 69 smd rect (at 7.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 635 "Net-(J10-Pad69)"))
+    (pad 68 smd rect (at 7.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 636 "/Reform 2 PCIe/M2_SUSCLK"))
+    (pad 67 smd rect (at 7.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 637 "Net-(J10-Pad67)"))
+    (pad 66 smd rect (at 5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 638 "Net-(J10-Pad66)"))
+    (pad 65 smd rect (at 4.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 639 "Net-(J10-Pad65)"))
+    (pad 64 smd rect (at 4.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 640 "Net-(J10-Pad64)"))
+    (pad 63 smd rect (at 4.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 641 "Net-(J10-Pad63)"))
+    (pad 62 smd rect (at 4 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 642 "Net-(J10-Pad62)"))
+    (pad 61 smd rect (at 3.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 643 "Net-(J10-Pad61)"))
+    (pad 60 smd rect (at 3.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 644 "Net-(J10-Pad60)"))
+    (pad 59 smd rect (at 3.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 645 "Net-(J10-Pad59)"))
+    (pad 58 smd rect (at 3 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 646 "Net-(J10-Pad58)"))
+    (pad 57 smd rect (at 2.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 56 smd rect (at 2.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 647 "Net-(J10-Pad56)"))
+    (pad 55 smd rect (at 2.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 484 PCIE2_CLK_P))
+    (pad 54 smd rect (at 2 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 648 "/Reform 2 PCIe/M2_NPEWAKE"))
+    (pad 53 smd rect (at 1.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 483 PCIE2_CLK_N))
+    (pad 52 smd rect (at 1.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 649 "Net-(J10-Pad52)"))
+    (pad 51 smd rect (at 1.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 50 smd rect (at 1 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 516 PCIE_RESETn))
+    (pad 49 smd rect (at 0.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 487 PCIE2_TX_P))
+    (pad 48 smd rect (at 0.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 650 "Net-(J10-Pad48)"))
+    (pad 47 smd rect (at 0.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 488 PCIE2_TX_N))
+    (pad 46 smd rect (at 0 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 651 "Net-(J10-Pad46)"))
+    (pad 45 smd rect (at -0.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 44 smd rect (at -0.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 652 "Net-(J10-Pad44)"))
+    (pad 43 smd rect (at -0.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 485 PCIE2_RX_P))
+    (pad 42 smd rect (at -1 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 653 "Net-(J10-Pad42)"))
+    (pad 41 smd rect (at -1.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 486 PCIE2_RX_N))
+    (pad 40 smd rect (at -1.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 654 "Net-(J10-Pad40)"))
+    (pad 39 smd rect (at -1.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 38 smd rect (at -2 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 655 "/Reform 2 PCIe/M2_DEVSLP"))
+    (pad 37 smd rect (at -2.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 656 "Net-(J10-Pad37)"))
+    (pad 36 smd rect (at -2.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 657 "Net-(J10-Pad36)"))
+    (pad 35 smd rect (at -2.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 658 "Net-(J10-Pad35)"))
+    (pad 34 smd rect (at -3 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 659 "Net-(J10-Pad34)"))
+    (pad 33 smd rect (at -3.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 32 smd rect (at -3.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 660 "Net-(J10-Pad32)"))
+    (pad 31 smd rect (at -3.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 661 "Net-(J10-Pad31)"))
+    (pad 30 smd rect (at -4 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 662 "Net-(J10-Pad30)"))
+    (pad 29 smd rect (at -4.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 663 "Net-(J10-Pad29)"))
+    (pad 28 smd rect (at -4.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 664 "Net-(J10-Pad28)"))
+    (pad 27 smd rect (at -4.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 26 smd rect (at -5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 665 "Net-(J10-Pad26)"))
+    (pad 25 smd rect (at -5.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 666 "Net-(J10-Pad25)"))
+    (pad 24 smd rect (at -5.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 667 "Net-(J10-Pad24)"))
+    (pad 23 smd rect (at -5.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 668 "Net-(J10-Pad23)"))
+    (pad 22 smd rect (at -6 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 669 "Net-(J10-Pad22)"))
+    (pad 21 smd rect (at -6.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 670 "Net-(J10-Pad21)"))
+    (pad 20 smd rect (at -6.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 671 "Net-(J10-Pad20)"))
+    (pad 11 smd rect (at -6.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 672 "Net-(J10-Pad11)"))
+    (pad 10 smd rect (at -7 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 673 "/Reform 2 PCIe/M2_DAS_DSS"))
+    (pad 9 smd rect (at -7.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 577 "Net-(J10-Pad9)"))
+    (pad 8 smd rect (at -7.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 580 "Net-(J10-Pad8)"))
+    (pad 7 smd rect (at -7.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 579 "Net-(J10-Pad7)"))
+    (pad 6 smd rect (at -8 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 578 "Net-(J10-Pad6)"))
+    (pad 5 smd rect (at -8.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 576 "Net-(J10-Pad5)"))
+    (pad 4 smd rect (at -8.5 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 565 "Net-(C58-Pad1)"))
+    (pad 3 smd rect (at -8.75 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 2 smd rect (at -9 2.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 565 "Net-(C58-Pad1)"))
+    (pad 1 smd rect (at -9.25 -5.275) (size 0.3 1.55) (layers F.Cu F.Paste F.Mask)
+      (net 575 "Net-(J10-Pad1)"))
+    (pad Hole np_thru_hole circle (at 10 0) (size 1.6 1.6) (drill 1.6) (layers *.Cu *.Mask F.SilkS))
+    (pad Hole np_thru_hole circle (at -10 0) (size 1.1 1.1) (drill 1.1) (layers *.Cu *.Mask F.SilkS))
     (model ${KIPRJMOD}/3d-models/c-1-2199230-5-b2-3d.stp
       (offset (xyz 0 -2.5 2.19))
       (scale (xyz 1 1 1))
@@ -2068,7 +2839,7 @@
   )
 
   (module Crystal:Crystal_SMD_5032-2Pin_5.0x3.2mm (layer F.Cu) (tedit 5A0FD1B2) (tstamp 5D14F131)
-    (at 155.35 203.22)
+    (at 222.5 73)
     (descr "SMD Crystal SERIES SMD2520/2 http://www.icbase.com/File/PDF/HKC/HKC00061008.pdf, 5.0x3.2mm^2 package")
     (tags "SMD SMT crystal")
     (path /5CC81028/5E225E59)
@@ -2103,9 +2874,9 @@
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 2 smd rect (at 1.85 0) (size 2 2.4) (layers F.Cu F.Paste F.Mask)
-      (net 571 "Net-(C51-Pad1)"))
+      (net 563 "Net-(C51-Pad1)"))
     (pad 1 smd rect (at -1.85 0) (size 2 2.4) (layers F.Cu F.Paste F.Mask)
-      (net 570 "Net-(C48-Pad1)"))
+      (net 562 "Net-(C48-Pad1)"))
     (model ${KISYS3DMOD}/Crystal.3dshapes/Crystal_SMD_5032-2Pin_5.0x3.2mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2114,7 +2885,7 @@
   )
 
   (module Package_QFP:LQFP-48_7x7mm_P0.5mm (layer F.Cu) (tedit 5C18330E) (tstamp 5D14F068)
-    (at 263.5 107.5)
+    (at 222.5 82.5)
     (descr "LQFP, 48 Pin (https://www.analog.com/media/en/technical-documentation/data-sheets/ltc2358-16.pdf), generated with kicad-footprint-generator ipc_gullwing_generator.py")
     (tags "LQFP QFP")
     (path /5CC81028/5EE9B6D2)
@@ -2167,101 +2938,101 @@
     (fp_line (start 3.61 3.61) (end 3.61 3.16) (layer F.SilkS) (width 0.12))
     (fp_line (start 3.16 3.61) (end 3.61 3.61) (layer F.SilkS) (width 0.12))
     (pad 48 smd roundrect (at -2.75 -4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 609 "Net-(U18-Pad48)"))
+      (net 601 "Net-(U18-Pad48)"))
     (pad 47 smd roundrect (at -2.25 -4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 610 "/Reform 2 Power/LPC_TXDa"))
+      (net 602 "/Reform 2 Power/LPC_TXDa"))
     (pad 46 smd roundrect (at -1.75 -4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 611 "/Reform 2 Power/LPC_RXDa"))
+      (net 603 "/Reform 2 Power/LPC_RXDa"))
     (pad 45 smd roundrect (at -1.25 -4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 612 "/Reform 2 Power/LPC_SCLKa"))
+      (net 604 "/Reform 2 Power/LPC_SCLKa"))
     (pad 44 smd roundrect (at -0.75 -4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad 43 smd roundrect (at -0.25 -4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 613 "/Reform 2 Power/LPC_SCK1a"))
+      (net 605 "/Reform 2 Power/LPC_SCK1a"))
     (pad 42 smd roundrect (at 0.25 -4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 614 "/Reform 2 Power/LPC_AD7"))
+      (net 606 "/Reform 2 Power/LPC_AD7"))
     (pad 41 smd roundrect (at 0.75 -4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 40 smd roundrect (at 1.25 -4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 615 "/Reform 2 Power/LPC_AD5"))
+      (net 607 "/Reform 2 Power/LPC_AD5"))
     (pad 39 smd roundrect (at 1.75 -4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 616 "/Reform 2 Power/LPC_SWDIO"))
+      (net 608 "/Reform 2 Power/LPC_SWDIO"))
     (pad 38 smd roundrect (at 2.25 -4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 595 "/Reform 2 Power/LPC_MOSI1b"))
+      (net 587 "/Reform 2 Power/LPC_MOSI1b"))
     (pad 37 smd roundrect (at 2.75 -4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 617 "/Reform 2 Power/LPC_RXDb"))
+      (net 609 "/Reform 2 Power/LPC_RXDb"))
     (pad 36 smd roundrect (at 4.1625 -2.75) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 618 "/Reform 2 Power/LPC_TXDb"))
+      (net 610 "/Reform 2 Power/LPC_TXDb"))
     (pad 35 smd roundrect (at 4.1625 -2.25) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 619 "/Reform 2 Power/LPC_TRST"))
+      (net 611 "/Reform 2 Power/LPC_TRST"))
     (pad 34 smd roundrect (at 4.1625 -1.75) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 620 "/Reform 2 Power/LPC_TDO"))
+      (net 612 "/Reform 2 Power/LPC_TDO"))
     (pad 33 smd roundrect (at 4.1625 -1.25) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 621 "/Reform 2 Power/LPC_TMS"))
+      (net 613 "/Reform 2 Power/LPC_TMS"))
     (pad 32 smd roundrect (at 4.1625 -0.75) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 622 "/Reform 2 Power/LPC_TDI"))
+      (net 614 "/Reform 2 Power/LPC_TDI"))
     (pad 31 smd roundrect (at 4.1625 -0.25) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 623 "/Reform 2 Power/LPC_SCK0b"))
+      (net 615 "/Reform 2 Power/LPC_SCK0b"))
     (pad 30 smd roundrect (at 4.1625 0.25) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 624 "/Reform 2 Power/LPC_MISO1a"))
+      (net 616 "/Reform 2 Power/LPC_MISO1a"))
     (pad 29 smd roundrect (at 4.1625 0.75) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 625 "/Reform 2 Power/LPC_SCK0a"))
+      (net 617 "/Reform 2 Power/LPC_SCK0a"))
     (pad 28 smd roundrect (at 4.1625 1.25) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 626 "/Reform 2 Power/LPC_MOSI0"))
+      (net 618 "/Reform 2 Power/LPC_MOSI0"))
     (pad 27 smd roundrect (at 4.1625 1.75) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 627 "/Reform 2 Power/LPC_MISO0"))
+      (net 619 "/Reform 2 Power/LPC_MISO0"))
     (pad 26 smd roundrect (at 4.1625 2.25) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 594 "/Reform 2 Power/LPC_MISO1b"))
+      (net 586 "/Reform 2 Power/LPC_MISO1b"))
     (pad 25 smd roundrect (at 4.1625 2.75) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 628 "Net-(U18-Pad25)"))
+      (net 620 "Net-(U18-Pad25)"))
     (pad 24 smd roundrect (at 2.75 4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 629 "/Reform 2 Power/LPC_SCLKc"))
+      (net 621 "/Reform 2 Power/LPC_SCLKc"))
     (pad 23 smd roundrect (at 2.25 4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 630 "/Reform 2 Power/LPC_NCTS"))
+      (net 622 "/Reform 2 Power/LPC_NCTS"))
     (pad 22 smd roundrect (at 1.75 4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 631 "/Reform 2 Power/LPC_NUSBCON"))
+      (net 623 "/Reform 2 Power/LPC_NUSBCON"))
     (pad 21 smd roundrect (at 1.25 4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 632 "/Reform 2 Power/LPC_SCLKb"))
+      (net 624 "/Reform 2 Power/LPC_SCLKb"))
     (pad 20 smd roundrect (at 0.75 4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 591 "Net-(R70-Pad2)"))
+      (net 583 "Net-(R70-Pad2)"))
     (pad 19 smd roundrect (at 0.25 4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 592 "Net-(R72-Pad2)"))
+      (net 584 "Net-(R72-Pad2)"))
     (pad 18 smd roundrect (at -0.25 4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 596 "/Reform 2 Power/LPC_SSEL1"))
+      (net 588 "/Reform 2 Power/LPC_SSEL1"))
     (pad 17 smd roundrect (at -0.75 4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 633 "/Reform 2 Power/LPC_MOSI1a"))
+      (net 625 "/Reform 2 Power/LPC_MOSI1a"))
     (pad 16 smd roundrect (at -1.25 4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 589 CHG_SDA))
+      (net 581 CHG_SDA))
     (pad 15 smd roundrect (at -1.75 4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 590 CHG_SCL))
+      (net 582 CHG_SCL))
     (pad 14 smd roundrect (at -2.25 4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 634 "/Reform 2 Power/LPC_UVBUS"))
+      (net 626 "/Reform 2 Power/LPC_UVBUS"))
     (pad 13 smd roundrect (at -2.75 4.1625) (size 0.3 1.475) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 593 "/Reform 2 Power/LPC_SCK1b"))
+      (net 585 "/Reform 2 Power/LPC_SCK1b"))
     (pad 12 smd roundrect (at -4.1625 2.75) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 635 "/Reform 2 Power/LPC_TXDc"))
+      (net 627 "/Reform 2 Power/LPC_TXDc"))
     (pad 11 smd roundrect (at -4.1625 2.25) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 636 "/Reform 2 Power/LPC_RXDc"))
+      (net 628 "/Reform 2 Power/LPC_RXDc"))
     (pad 10 smd roundrect (at -4.1625 1.75) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 637 "/Reform 2 Power/LPC_SSEL0"))
+      (net 629 "/Reform 2 Power/LPC_SSEL0"))
     (pad 9 smd roundrect (at -4.1625 1.25) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 638 "Net-(U18-Pad9)"))
+      (net 630 "Net-(U18-Pad9)"))
     (pad 8 smd roundrect (at -4.1625 0.75) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad 7 smd roundrect (at -4.1625 0.25) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 570 "Net-(C48-Pad1)"))
+      (net 562 "Net-(C48-Pad1)"))
     (pad 6 smd roundrect (at -4.1625 -0.25) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 571 "Net-(C51-Pad1)"))
+      (net 563 "Net-(C51-Pad1)"))
     (pad 5 smd roundrect (at -4.1625 -0.75) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 4 smd roundrect (at -4.1625 -1.25) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 598 "/Reform 2 Power/LPC_UFTOGG"))
+      (net 590 "/Reform 2 Power/LPC_UFTOGG"))
     (pad 3 smd roundrect (at -4.1625 -1.75) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 639 "/Reform 2 Power/LPC_NRESET"))
+      (net 631 "/Reform 2 Power/LPC_NRESET"))
     (pad 2 smd roundrect (at -4.1625 -2.25) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 640 "/Reform 2 Power/LPC_NDTR"))
+      (net 632 "/Reform 2 Power/LPC_NDTR"))
     (pad 1 smd roundrect (at -4.1625 -2.75) (size 1.475 0.3) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 641 "Net-(U18-Pad1)"))
+      (net 633 "Net-(U18-Pad1)"))
     (model ${KISYS3DMOD}/Package_QFP.3dshapes/LQFP-48_7x7mm_P0.5mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2270,7 +3041,7 @@
   )
 
   (module Package_SO:SOIC-8_3.9x4.9mm_P1.27mm (layer F.Cu) (tedit 5C97300E) (tstamp 5D0DF34B)
-    (at 170 156.5 180)
+    (at 221.5 61 180)
     (descr "SOIC, 8 Pin (JEDEC MS-012AA, https://www.analog.com/media/en/package-pcb-resources/package/pkg_pdf/soic_narrow-r/r_8.pdf), generated with kicad-footprint-generator ipc_gullwing_generator.py")
     (tags "SOIC SO")
     (path /5CC81028/5E6EF31B)
@@ -2298,21 +3069,21 @@
     (fp_line (start 0 2.56) (end -1.95 2.56) (layer F.SilkS) (width 0.12))
     (fp_line (start 0 2.56) (end 1.95 2.56) (layer F.SilkS) (width 0.12))
     (pad 8 smd roundrect (at 2.475 -1.905 180) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 419 "Net-(U12-Pad8)"))
+      (net 411 "Net-(U12-Pad8)"))
     (pad 7 smd roundrect (at 2.475 -0.635 180) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 420 "Net-(U12-Pad7)"))
+      (net 412 "Net-(U12-Pad7)"))
     (pad 6 smd roundrect (at 2.475 0.635 180) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 417 "Net-(U12-Pad6)"))
+      (net 409 "Net-(U12-Pad6)"))
     (pad 5 smd roundrect (at 2.475 1.905 180) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 418 "Net-(U12-Pad5)"))
+      (net 410 "Net-(U12-Pad5)"))
     (pad 4 smd roundrect (at -2.475 1.905 180) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 607 "Net-(U12-Pad4)"))
+      (net 599 "Net-(U12-Pad4)"))
     (pad 3 smd roundrect (at -2.475 0.635 180) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 416 "Net-(U12-Pad3)"))
+      (net 408 "Net-(U12-Pad3)"))
     (pad 2 smd roundrect (at -2.475 -0.635 180) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 608 "Net-(U12-Pad2)"))
+      (net 600 "Net-(U12-Pad2)"))
     (pad 1 smd roundrect (at -2.475 -1.905 180) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 415 "Net-(U12-Pad1)"))
+      (net 407 "Net-(U12-Pad1)"))
     (model ${KISYS3DMOD}/Package_SO.3dshapes/SOIC-8_3.9x4.9mm_P1.27mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2321,490 +3092,96 @@
   )
 
   (module TestPoint:TestPoint_Pad_1.0x1.0mm (layer F.Cu) (tedit 5A0F774F) (tstamp 5D14CFEA)
-    (at 178.46 194.02)
+    (at 192.5 174)
     (descr "SMD rectangular pad as test Point, square 1.0mm side length")
     (tags "test point SMD pad rectangle square")
     (path /5CC81028/60939E8A)
     (attr virtual)
-    (fp_text reference TP2 (at 0 -1.448) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value T_LSDA (at 0 1.55) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 1 1) (end -1 1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1 1) (end 1 -1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1 -1) (end -1 1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1 -1) (end 1 -1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 0.7) (end -0.7 -0.7) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.7 0.7) (end -0.7 0.7) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.7 -0.7) (end 0.7 0.7) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.7 -0.7) (end 0.7 -0.7) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 0 -1.45) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 smd rect (at 0 0) (size 1 1) (layers F.Cu F.Mask)
-      (net 589 CHG_SDA))
-  )
-
-  (module TestPoint:TestPoint_Pad_1.0x1.0mm (layer F.Cu) (tedit 5A0F774F) (tstamp 5D14CFDC)
-    (at 175.26 195.99)
-    (descr "SMD rectangular pad as test Point, square 1.0mm side length")
-    (tags "test point SMD pad rectangle square")
-    (path /5CC81028/608E9805)
-    (attr virtual)
-    (fp_text reference TP1 (at 0 -1.448) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value T_LSCL (at 0 1.55) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 1 1) (end -1 1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1 1) (end 1 -1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1 -1) (end -1 1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1 -1) (end 1 -1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 0.7) (end -0.7 -0.7) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.7 0.7) (end -0.7 0.7) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.7 -0.7) (end 0.7 0.7) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.7 -0.7) (end 0.7 -0.7) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 0 -1.45) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 smd rect (at 0 0) (size 1 1) (layers F.Cu F.Mask)
-      (net 590 CHG_SCL))
-  )
-
-  (module TestPoint:TestPoint_Pad_1.0x1.0mm (layer F.Cu) (tedit 5A0F774F) (tstamp 5D14CFCE)
-    (at 178.46 190.97)
-    (descr "SMD rectangular pad as test Point, square 1.0mm side length")
-    (tags "test point SMD pad rectangle square")
-    (path /5CC81028/5E8EBB68)
-    (attr virtual)
-    (fp_text reference SW2 (at 0 -1.448) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value SW_Push (at 0 1.55) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 1 1) (end -1 1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1 1) (end 1 -1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1 -1) (end -1 1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1 -1) (end 1 -1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 0.7) (end -0.7 -0.7) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.7 0.7) (end -0.7 0.7) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.7 -0.7) (end 0.7 0.7) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.7 -0.7) (end 0.7 -0.7) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 0 -1.45) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 smd rect (at 0 0) (size 1 1) (layers F.Cu F.Mask)
-      (net 40 GND))
-  )
-
-  (module Button_Switch_SMD:SW_Push_1P1T_NO_CK_KMR2 (layer F.Cu) (tedit 5A02FC95) (tstamp 5D14CFC0)
-    (at 166.4 198.92)
-    (descr "CK components KMR2 tactile switch http://www.ckswitches.com/media/1479/kmr2.pdf")
-    (tags "tactile switch kmr2")
-    (path /5CC81028/60DB1D13)
-    (attr smd)
-    (fp_text reference SW1 (at 0 -2.45) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value SW_Push (at 0 2.55) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -2.2 0.05) (end -2.2 -0.05) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.2 -1.55) (end -2.2 -1.55) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.2 1.55) (end 2.2 1.55) (layer F.SilkS) (width 0.12))
-    (fp_circle (center 0 0) (end 0 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.8 1.8) (end -2.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.8 1.8) (end -2.8 1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.8 -1.8) (end 2.8 1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.8 -1.8) (end 2.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.2 0.05) (end 2.2 -0.05) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.1 1.4) (end -2.1 -1.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.1 1.4) (end -2.1 1.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.1 -1.4) (end 2.1 1.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.1 -1.4) (end 2.1 -1.4) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 0 -2.45) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 2 smd rect (at 2.05 0.8 90) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
-      (net 598 "/Reform 2 Power/LPC_UFTOGG"))
-    (pad 1 smd rect (at 2.05 -0.8 90) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 2 smd rect (at -2.05 0.8 90) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
-      (net 598 "/Reform 2 Power/LPC_UFTOGG"))
-    (pad 1 smd rect (at -2.05 -0.8 90) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_Push_1P1T_NO_CK_KMR2.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Button_Switch_SMD:SW_Push_1P1T_NO_CK_KMR2 (layer F.Cu) (tedit 5A02FC95) (tstamp 5D14CFAA)
-    (at 186.94 191.77)
-    (descr "CK components KMR2 tactile switch http://www.ckswitches.com/media/1479/kmr2.pdf")
-    (tags "tactile switch kmr2")
-    (path /5D06A7B6/60F2545C)
-    (attr smd)
-    (fp_text reference R77 (at 0 -2.45) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 0 (at 0 2.55) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -2.2 0.05) (end -2.2 -0.05) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.2 -1.55) (end -2.2 -1.55) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.2 1.55) (end 2.2 1.55) (layer F.SilkS) (width 0.12))
-    (fp_circle (center 0 0) (end 0 0.8) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.8 1.8) (end -2.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.8 1.8) (end -2.8 1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.8 -1.8) (end 2.8 1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.8 -1.8) (end 2.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.2 0.05) (end 2.2 -0.05) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.1 1.4) (end -2.1 -1.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.1 1.4) (end -2.1 1.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.1 -1.4) (end 2.1 1.4) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.1 -1.4) (end 2.1 -1.4) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 0 -2.45) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 2 smd rect (at 2.05 0.8 90) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
-      (net 597 "Net-(R77-Pad2)"))
-    (pad 1 smd rect (at 2.05 -0.8 90) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 2 smd rect (at -2.05 0.8 90) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
-      (net 597 "Net-(R77-Pad2)"))
-    (pad 1 smd rect (at -2.05 -0.8 90) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_Push_1P1T_NO_CK_KMR2.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_SMD:R_0201_0603Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF94)
-    (at 178.01 196.42)
-    (descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
-    (tags resistor)
-    (path /5CC81028/5FEFDBB8)
-    (attr smd)
-    (fp_text reference R76 (at 0 -1.05) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 0 (at 0 1.05) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 -0.68) (layer F.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)))
-    )
-    (fp_line (start 0.7 0.35) (end -0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.7 -0.35) (end 0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 -0.35) (end 0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 0.35) (end -0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 596 "/Reform 2 Power/LPC_SSEL1"))
-    (pad 1 smd roundrect (at -0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 348 BMON_CS))
-    (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_SMD:R_0201_0603Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF83)
-    (at 173.4 199.98)
-    (descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
-    (tags resistor)
-    (path /5CC81028/5FEFD6BC)
-    (attr smd)
-    (fp_text reference R75 (at 0 -1.05) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 0 (at 0 1.05) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 -0.68) (layer F.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)))
-    )
-    (fp_line (start 0.7 0.35) (end -0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.7 -0.35) (end 0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 -0.35) (end 0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 0.35) (end -0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 595 "/Reform 2 Power/LPC_MOSI1b"))
-    (pad 1 smd roundrect (at -0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 349 BMON_SDO))
-    (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_SMD:R_0201_0603Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF72)
-    (at 172.23 201.73)
-    (descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
-    (tags resistor)
-    (path /5CC81028/5FEFD58C)
-    (attr smd)
-    (fp_text reference R74 (at 0 -1.05) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 0 (at 0 1.05) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 -0.68) (layer F.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)))
-    )
-    (fp_line (start 0.7 0.35) (end -0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.7 -0.35) (end 0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 -0.35) (end 0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 0.35) (end -0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 594 "/Reform 2 Power/LPC_MISO1b"))
-    (pad 1 smd roundrect (at -0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 350 BMON_SDI))
-    (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_SMD:R_0201_0603Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF61)
-    (at 160.2 204.18)
-    (descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
-    (tags resistor)
-    (path /5CC81028/5FEFD1B6)
-    (attr smd)
-    (fp_text reference R73 (at 0 -1.05) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 0 (at 0 1.05) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 -0.68) (layer F.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)))
-    )
-    (fp_line (start 0.7 0.35) (end -0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.7 -0.35) (end 0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 -0.35) (end 0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 0.35) (end -0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 593 "/Reform 2 Power/LPC_SCK1b"))
-    (pad 1 smd roundrect (at -0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 351 BMON_SCK))
-    (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_SMD:R_0201_0603Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF50)
-    (at 162.65 204.63)
-    (descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
-    (tags resistor)
-    (path /5CC81028/5F3A0059)
-    (attr smd)
-    (fp_text reference R72 (at 0 -1.05) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 33 (at 0 1.05) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 -0.68) (layer F.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)))
-    )
-    (fp_line (start 0.7 0.35) (end -0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.7 -0.35) (end 0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 -0.35) (end 0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 0.35) (end -0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 592 "Net-(R72-Pad2)"))
-    (pad 1 smd roundrect (at -0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 578 "Net-(J8-Pad2)"))
-    (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_SMD:R_0201_0603Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF3F)
-    (at 170.95 199.98)
-    (descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
-    (tags resistor)
-    (path /5CC81028/5F539611)
-    (attr smd)
-    (fp_text reference R71 (at 0 -1.05) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 1.5k (at 0 1.05) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text user %R (at 0 -0.68) (layer F.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)))
-    )
-    (fp_line (start 0.7 0.35) (end -0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.7 -0.35) (end 0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 -0.35) (end 0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 0.35) (end -0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 575 "Net-(J8-Pad3)"))
-    (pad 1 smd roundrect (at -0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
-    (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_SMD:R_0201_0603Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF2E)
-    (at 165.1 204.63)
-    (descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
-    (tags resistor)
-    (path /5CC81028/5F39F610)
-    (attr smd)
-    (fp_text reference R70 (at 0 -1.05) (layer F.SilkS)
+    (fp_text reference TP2 (at 0 -1.448) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 33 (at 0 1.05) (layer F.Fab)
+    (fp_text value T_LSDA (at 0 1.55) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -0.68) (layer F.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)))
-    )
-    (fp_line (start 0.7 0.35) (end -0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.7 -0.35) (end 0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 -0.35) (end 0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 0.35) (end -0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 591 "Net-(R70-Pad2)"))
-    (pad 1 smd roundrect (at -0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 575 "Net-(J8-Pad3)"))
-    (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
+    (fp_line (start 1 1) (end -1 1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1 1) (end 1 -1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1 -1) (end -1 1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1 -1) (end 1 -1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.7 0.7) (end -0.7 -0.7) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.7 0.7) (end -0.7 0.7) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.7 -0.7) (end 0.7 0.7) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.7 -0.7) (end 0.7 -0.7) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.45) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
     )
+    (pad 1 smd rect (at 0 0) (size 1 1) (layers F.Cu F.Mask)
+      (net 581 CHG_SDA))
   )
 
-  (module Resistor_SMD:R_0201_0603Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D14CF1D)
-    (at 167.55 204.63)
-    (descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
-    (tags resistor)
-    (path /5CC81028/609DDFBB)
-    (attr smd)
-    (fp_text reference R69 (at 0 -1.05) (layer F.SilkS)
+  (module TestPoint:TestPoint_Pad_1.0x1.0mm (layer F.Cu) (tedit 5A0F774F) (tstamp 5D14CFDC)
+    (at 189 174)
+    (descr "SMD rectangular pad as test Point, square 1.0mm side length")
+    (tags "test point SMD pad rectangle square")
+    (path /5CC81028/608E9805)
+    (attr virtual)
+    (fp_text reference TP1 (at 0 -1.448) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.05) (layer F.Fab)
+    (fp_text value T_LSCL (at 0 1.55) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -0.68) (layer F.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)))
-    )
-    (fp_line (start 0.7 0.35) (end -0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.7 -0.35) (end 0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 -0.35) (end 0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 0.35) (end -0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 590 CHG_SCL))
-    (pad 1 smd roundrect (at -0.32 0) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
-    (pad "" smd roundrect (at 0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (pad "" smd roundrect (at -0.345 0) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
+    (fp_line (start 1 1) (end -1 1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1 1) (end 1 -1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1 -1) (end -1 1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1 -1) (end 1 -1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.7 0.7) (end -0.7 -0.7) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.7 0.7) (end -0.7 0.7) (layer F.SilkS) (width 0.12))
+    (fp_line (start 0.7 -0.7) (end 0.7 0.7) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.7 -0.7) (end 0.7 -0.7) (layer F.SilkS) (width 0.12))
+    (fp_text user %R (at 0 -1.45) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
     )
+    (pad 1 smd rect (at 0 0) (size 1 1) (layers F.Cu F.Mask)
+      (net 582 CHG_SCL))
   )
 
-  (module Resistor_SMD:R_0201_0603Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD4C4)
-    (at 66.5 51 180)
-    (descr "Resistor SMD 0201 (0603 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.vishay.com/docs/20052/crcw0201e3.pdf), generated with kicad-footprint-generator")
-    (tags resistor)
-    (path /5CC81028/60A2BECF)
+  (module Button_Switch_SMD:SW_Push_1P1T_NO_CK_KMR2 (layer F.Cu) (tedit 5A02FC95) (tstamp 5D14CFC0)
+    (at 214.5 83.5 90)
+    (descr "CK components KMR2 tactile switch http://www.ckswitches.com/media/1479/kmr2.pdf")
+    (tags "tactile switch kmr2")
+    (path /5CC81028/60DB1D13)
     (attr smd)
-    (fp_text reference R68 (at 0 -1.05) (layer F.SilkS)
+    (fp_text reference SW1 (at 0 -2.45 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 0 1.05) (layer F.Fab)
+    (fp_text value SW_Push (at 0 2.55 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -0.68) (layer F.Fab)
-      (effects (font (size 0.25 0.25) (thickness 0.04)))
+    (fp_line (start -2.2 0.05) (end -2.2 -0.05) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.2 -1.55) (end -2.2 -1.55) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.2 1.55) (end 2.2 1.55) (layer F.SilkS) (width 0.12))
+    (fp_circle (center 0 0) (end 0 0.8) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.8 1.8) (end -2.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.8 1.8) (end -2.8 1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.8 -1.8) (end 2.8 1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -2.8 -1.8) (end 2.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 2.2 0.05) (end 2.2 -0.05) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.1 1.4) (end -2.1 -1.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.1 1.4) (end -2.1 1.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.1 -1.4) (end 2.1 1.4) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.1 -1.4) (end 2.1 -1.4) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 -2.45 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 0.7 0.35) (end -0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.7 -0.35) (end 0.7 0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 -0.35) (end 0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.7 0.35) (end -0.7 -0.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.3 0.15) (end -0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.3 -0.15) (end 0.3 0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 -0.15) (end 0.3 -0.15) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.3 0.15) (end -0.3 -0.15) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.32 0 180) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 589 CHG_SDA))
-    (pad 1 smd roundrect (at -0.32 0 180) (size 0.46 0.4) (layers F.Cu F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
-    (pad "" smd roundrect (at 0.345 0 180) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (pad "" smd roundrect (at -0.345 0 180) (size 0.318 0.36) (layers F.Paste) (roundrect_rratio 0.25))
-    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl
+    (pad 2 smd rect (at 2.05 0.8 180) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
+      (net 590 "/Reform 2 Power/LPC_UFTOGG"))
+    (pad 1 smd rect (at 2.05 -0.8 180) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 2 smd rect (at -2.05 0.8 180) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
+      (net 590 "/Reform 2 Power/LPC_UFTOGG"))
+    (pad 1 smd rect (at -2.05 -0.8 180) (size 0.9 1) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (model ${KISYS3DMOD}/Button_Switch_SMD.3dshapes/SW_Push_1P1T_NO_CK_KMR2.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -2812,14 +3189,14 @@
   )
 
   (module Connector_PinHeader_2.00mm:PinHeader_1x04_P2.00mm_Horizontal (layer F.Cu) (tedit 59FED667) (tstamp 5D14C360)
-    (at 151.5 125)
+    (at 158 123.5)
     (descr "Through hole angled pin header, 1x04, 2.00mm pitch, 4.2mm pin length, single row")
     (tags "Through hole angled pin header THT 1x04 2.00mm single row")
     (path /5D06A2FD/60F17696)
     (fp_text reference J9 (at 3.1 -2) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value Conn_01x04_Male (at 3.1 8) (layer F.Fab)
+    (fp_text value USB_INT1 (at 3.1 8) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text user %R (at 2.25 3 90) (layer F.Fab)
@@ -2893,13 +3270,13 @@
     (fp_line (start 3 -1) (end 3 7) (layer F.Fab) (width 0.1))
     (fp_line (start 1.875 -1) (end 3 -1) (layer F.Fab) (width 0.1))
     (pad 4 thru_hole oval (at 0 6) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
-      (net 579 "Net-(J9-Pad4)"))
+      (net 571 "Net-(J9-Pad4)"))
     (pad 3 thru_hole oval (at 0 4) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
-      (net 580 "Net-(J9-Pad3)"))
+      (net 572 "Net-(J9-Pad3)"))
     (pad 2 thru_hole oval (at 0 2) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
-      (net 581 "Net-(J9-Pad2)"))
+      (net 573 "Net-(J9-Pad2)"))
     (pad 1 thru_hole rect (at 0 0) (size 1.35 1.35) (drill 0.8) (layers *.Cu *.Mask)
-      (net 582 "Net-(J9-Pad1)"))
+      (net 574 "Net-(J9-Pad1)"))
     (model ${KISYS3DMOD}/Connector_PinHeader_2.00mm.3dshapes/PinHeader_1x04_P2.00mm_Horizontal.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2960,15 +3337,15 @@
     (pad 6 thru_hole circle (at 2.5 -1.4625) (size 1.45 1.45) (drill 0.85) (layers *.Cu *.Mask)
       (net 40 GND))
     (pad 3 smd rect (at 0 -1.4625) (size 0.4 1.35) (layers F.Cu F.Paste F.Mask)
-      (net 575 "Net-(J8-Pad3)"))
+      (net 567 "Net-(J8-Pad3)"))
     (pad 4 smd rect (at 0.65 -1.4625) (size 0.4 1.35) (layers F.Cu F.Paste F.Mask)
-      (net 576 "Net-(J8-Pad4)"))
+      (net 568 "Net-(J8-Pad4)"))
     (pad 5 smd rect (at 1.3 -1.4625) (size 0.4 1.35) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 1 smd rect (at -1.3 -1.4625) (size 0.4 1.35) (layers F.Cu F.Paste F.Mask)
-      (net 577 "Net-(J8-Pad1)"))
+      (net 569 "Net-(J8-Pad1)"))
     (pad 2 smd rect (at -0.65 -1.4625) (size 0.4 1.35) (layers F.Cu F.Paste F.Mask)
-      (net 578 "Net-(J8-Pad2)"))
+      (net 570 "Net-(J8-Pad2)"))
     (pad 6 thru_hole circle (at -2.5 -1.4625) (size 1.45 1.45) (drill 0.85) (layers *.Cu *.Mask)
       (net 40 GND))
     (pad 6 smd rect (at 1 1.2375) (size 1.5 1.9) (layers F.Cu F.Paste F.Mask)
@@ -2981,7 +3358,7 @@
   )
 
   (module Capacitor_SMD:CP_Elec_6.3x3 (layer F.Cu) (tedit 5BCA39CF) (tstamp 5D14BC42)
-    (at 155 46.5 90)
+    (at 169 46 90)
     (descr "SMD capacitor, aluminum electrolytic, Nichicon, 6.3x3.0mm")
     (tags "capacitor electrolytic")
     (path /5D06AC46/6109429F)
@@ -3031,7 +3408,7 @@
     (pad 2 smd roundrect (at 2.7 0 90) (size 3.5 1.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.15625)
       (net 40 GND))
     (pad 1 smd roundrect (at -2.7 0 90) (size 3.5 1.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.15625)
-      (net 573 "Net-(C58-Pad1)"))
+      (net 565 "Net-(C58-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/CP_Elec_6.3x3.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3040,7 +3417,7 @@
   )
 
   (module Capacitor_SMD:CP_Elec_6.3x3 (layer F.Cu) (tedit 5BCA39CF) (tstamp 5D14BC1A)
-    (at 147.5 46.5 90)
+    (at 161.5 46 90)
     (descr "SMD capacitor, aluminum electrolytic, Nichicon, 6.3x3.0mm")
     (tags "capacitor electrolytic")
     (path /5D06AC46/61094295)
@@ -3090,7 +3467,7 @@
     (pad 2 smd roundrect (at 2.7 0 90) (size 3.5 1.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.15625)
       (net 40 GND))
     (pad 1 smd roundrect (at -2.7 0 90) (size 3.5 1.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.15625)
-      (net 573 "Net-(C58-Pad1)"))
+      (net 565 "Net-(C58-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/CP_Elec_6.3x3.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3099,7 +3476,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BBF2)
-    (at 177 182.63)
+    (at 180.5 156.13)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06AC46/6109428B)
@@ -3126,7 +3503,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 573 "Net-(C58-Pad1)"))
+      (net 565 "Net-(C58-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3135,7 +3512,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BBE1)
-    (at 169.77 185.14)
+    (at 173.27 158.64)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06AC46/61094281)
@@ -3162,7 +3539,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 573 "Net-(C58-Pad1)"))
+      (net 565 "Net-(C58-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3171,7 +3548,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BBD0)
-    (at 165.76 185.14)
+    (at 169.26 158.64)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06AC46/61094277)
@@ -3198,7 +3575,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 573 "Net-(C58-Pad1)"))
+      (net 565 "Net-(C58-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3207,7 +3584,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BBBF)
-    (at 172.99 182.63)
+    (at 176.49 156.13)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06AC46/6109426D)
@@ -3234,7 +3611,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 573 "Net-(C58-Pad1)"))
+      (net 565 "Net-(C58-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3243,12 +3620,12 @@
   )
 
   (module Capacitor_SMD:CP_Elec_6.3x3 (layer F.Cu) (tedit 5BCA39CF) (tstamp 5D14BBAE)
-    (at 81.5 46.5 90)
+    (at 184 46 90)
     (descr "SMD capacitor, aluminum electrolytic, Nichicon, 6.3x3.0mm")
     (tags "capacitor electrolytic")
     (path /5D06AC46/60FCC62A)
     (attr smd)
-    (fp_text reference C57 (at -5 -3 90) (layer F.SilkS)
+    (fp_text reference C57 (at -5 -4 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 330uF (at 0 4.35 90) (layer F.Fab)
@@ -3293,7 +3670,7 @@
     (pad 2 smd roundrect (at 2.7 0 90) (size 3.5 1.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.15625)
       (net 40 GND))
     (pad 1 smd roundrect (at -2.7 0 90) (size 3.5 1.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.15625)
-      (net 572 "Net-(C52-Pad1)"))
+      (net 564 "Net-(C52-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/CP_Elec_6.3x3.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3302,12 +3679,12 @@
   )
 
   (module Capacitor_SMD:CP_Elec_6.3x3 (layer F.Cu) (tedit 5BCA39CF) (tstamp 5D14BB86)
-    (at 74 46.5 90)
+    (at 176.5 46 90)
     (descr "SMD capacitor, aluminum electrolytic, Nichicon, 6.3x3.0mm")
     (tags "capacitor electrolytic")
     (path /5D06AC46/60FCBB5A)
     (attr smd)
-    (fp_text reference C56 (at 0 -4.35 90) (layer F.SilkS)
+    (fp_text reference C56 (at -5 2 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 330uF (at 0 4.35 90) (layer F.Fab)
@@ -3352,7 +3729,7 @@
     (pad 2 smd roundrect (at 2.7 0 90) (size 3.5 1.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.15625)
       (net 40 GND))
     (pad 1 smd roundrect (at -2.7 0 90) (size 3.5 1.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.15625)
-      (net 572 "Net-(C52-Pad1)"))
+      (net 564 "Net-(C52-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/CP_Elec_6.3x3.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3361,7 +3738,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BB5E)
-    (at 153.73 182.7)
+    (at 112 55.5)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06AC46/60FCACBE)
@@ -3388,7 +3765,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 572 "Net-(C52-Pad1)"))
+      (net 564 "Net-(C52-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3397,7 +3774,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BB4D)
-    (at 161.75 182.7)
+    (at 165.25 156.2)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06AC46/60FCAA65)
@@ -3424,7 +3801,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 572 "Net-(C52-Pad1)"))
+      (net 564 "Net-(C52-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3433,7 +3810,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BB3C)
-    (at 157.74 182.7)
+    (at 161.24 156.2)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06AC46/60FCA681)
@@ -3460,7 +3837,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 572 "Net-(C52-Pad1)"))
+      (net 564 "Net-(C52-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3469,7 +3846,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BB2B)
-    (at 168.98 182.63)
+    (at 172.48 156.13)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06AC46/60FC9F01)
@@ -3496,7 +3873,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 572 "Net-(C52-Pad1)"))
+      (net 564 "Net-(C52-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3505,18 +3882,18 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BB1A)
-    (at 174.93 190.7)
+    (at 226.5 73 90)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5E225E65)
     (attr smd)
-    (fp_text reference C51 (at 0 -1.43) (layer F.SilkS)
+    (fp_text reference C51 (at 0 -1.43 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 18pF (at 0 1.43) (layer F.Fab)
+    (fp_text value 18pF (at 0 1.43 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0) (layer F.Fab)
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.4 0.4) (thickness 0.06)))
     )
     (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
@@ -3529,10 +3906,10 @@
     (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+    (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
-    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 571 "Net-(C51-Pad1)"))
+    (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 563 "Net-(C51-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3541,7 +3918,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BB09)
-    (at 160.98 202.05)
+    (at 164.48 175.55)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5F82DFCE)
@@ -3568,7 +3945,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3577,7 +3954,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BAF8)
-    (at 164.99 202.5)
+    (at 168.49 176)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5F82DC36)
@@ -3604,7 +3981,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3613,18 +3990,18 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BAE7)
-    (at 171.73 197.85)
+    (at 218.5 73 90)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5E225E71)
     (attr smd)
-    (fp_text reference C48 (at 0 -1.43) (layer F.SilkS)
+    (fp_text reference C48 (at 0 -1.43 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 18pF (at 0 1.43) (layer F.Fab)
+    (fp_text value 18pF (at 0 1.43 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0) (layer F.Fab)
+    (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 0.4 0.4) (thickness 0.06)))
     )
     (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
@@ -3637,10 +4014,10 @@
     (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+    (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
-    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 570 "Net-(C48-Pad1)"))
+    (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 562 "Net-(C48-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3649,7 +4026,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BAD6)
-    (at 174.93 193.21)
+    (at 184.5 149.5 180)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5F7273D6)
@@ -3673,10 +4050,10 @@
     (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+    (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
-    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+    (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3685,7 +4062,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D14BAC5)
-    (at 169 202.5)
+    (at 172.5 176)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5F7271EE)
@@ -3712,7 +4089,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3721,7 +4098,7 @@
   )
 
   (module Connector_USB:USB3_A_Molex_48393-001 (layer F.Cu) (tedit 5A142044) (tstamp 5D1316F6)
-    (at 50.5 120 270)
+    (at 50.5 115 270)
     (descr "USB 3.0, type A, right angle (http://www.molex.com/pdm_docs/sd/483930003_sd.pdf)")
     (tags "USB 3.0 type A right angle")
     (path /5D06A2FD/5DA2390D)
@@ -3751,31 +4128,31 @@
     (fp_line (start 10.4 11.75) (end -3.4 11.75) (layer F.Fab) (width 0.1))
     (fp_line (start -3.4 -2.5) (end 10.4 -2.5) (layer F.Fab) (width 0.1))
     (pad 1 thru_hole circle (at 0 0 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 456 USB3_2_VBUS))
+      (net 448 USB3_2_VBUS))
     (pad 2 thru_hole circle (at 2.5 0 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 455 USB3_2_DN))
+      (net 447 USB3_2_DN))
     (pad 3 thru_hole circle (at 4.5 0 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 454 USB3_2_DP))
+      (net 446 USB3_2_DP))
     (pad 4 thru_hole circle (at 7 0 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
       (net 40 GND))
     (pad 5 thru_hole circle (at 7.5 -1.5 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 453 USB3_2_SSRXN))
+      (net 445 USB3_2_SSRXN))
     (pad 6 thru_hole circle (at 5.5 -1.5 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 452 USB3_2_SSRXP))
+      (net 444 USB3_2_SSRXP))
     (pad 7 thru_hole circle (at 3.5 -1.5 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 574 "Net-(J5-Pad7)"))
+      (net 566 "Net-(J5-Pad7)"))
     (pad 8 thru_hole circle (at 1.5 -1.5 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 429 "Net-(C39-Pad2)"))
+      (net 421 "Net-(C39-Pad2)"))
     (pad 9 thru_hole circle (at -0.5 -1.5 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 433 "Net-(C41-Pad2)"))
+      (net 425 "Net-(C41-Pad2)"))
     (pad 10 thru_hole oval (at 9.9 -0.75 270) (size 1.2 2.4) (drill oval 0.6 1.7) (layers *.Cu *.Mask)
-      (net 451 "Net-(J5-Pad10)"))
+      (net 443 "Net-(J5-Pad10)"))
     (pad 10 thru_hole oval (at -2.9 -0.75 270) (size 1.2 2.4) (drill oval 0.6 1.7) (layers *.Cu *.Mask)
-      (net 451 "Net-(J5-Pad10)"))
+      (net 443 "Net-(J5-Pad10)"))
     (pad 10 thru_hole oval (at 9.9 7.75 270) (size 1.2 2.1) (drill oval 0.6 1.4) (layers *.Cu *.Mask)
-      (net 451 "Net-(J5-Pad10)"))
+      (net 443 "Net-(J5-Pad10)"))
     (pad 10 thru_hole oval (at -2.9 7.75 270) (size 1.2 2.1) (drill oval 0.6 1.4) (layers *.Cu *.Mask)
-      (net 451 "Net-(J5-Pad10)"))
+      (net 443 "Net-(J5-Pad10)"))
     (model ${KIPRJMOD}/3d-models/483930001.stp
       (offset (xyz 3.5 -11.65 0.25))
       (scale (xyz 1 1 1))
@@ -3784,7 +4161,7 @@
   )
 
   (module footprints:HDMI-685119134923 (layer F.Cu) (tedit 5D111FCE) (tstamp 5D120D46)
-    (at 49.5 49.7 270)
+    (at 49.5 55.7 270)
     (descr "WR-COM SMT Horizontal HDMI, 19 pins")
     (path /5D0D8363/5D123420)
     (attr smd)
@@ -3859,13 +4236,13 @@
     (pad 12 smd rect (at -1 0 90) (size 0.28 2.6) (layers F.Cu F.Paste F.Mask)
       (net 2 HDMI_D3-))
     (pad 13 smd rect (at -1.5 0 90) (size 0.28 2.6) (layers F.Cu F.Paste F.Mask)
-      (net 292 "Net-(J4-Pad13)"))
+      (net 284 "Net-(J4-Pad13)"))
     (pad 14 smd rect (at -2 0 90) (size 0.28 2.6) (layers F.Cu F.Paste F.Mask)
-      (net 289 "Net-(J4-Pad14)"))
+      (net 281 "Net-(J4-Pad14)"))
     (pad 15 smd rect (at -2.5 0 90) (size 0.28 2.6) (layers F.Cu F.Paste F.Mask)
-      (net 291 "Net-(J4-Pad15)"))
+      (net 283 "Net-(J4-Pad15)"))
     (pad 16 smd rect (at -3 0 90) (size 0.28 2.6) (layers F.Cu F.Paste F.Mask)
-      (net 288 "Net-(J4-Pad16)"))
+      (net 280 "Net-(J4-Pad16)"))
     (pad 17 smd rect (at -3.5 0 90) (size 0.28 2.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 2 smd rect (at 4 0 90) (size 0.28 2.6) (layers F.Cu F.Paste F.Mask)
@@ -3873,9 +4250,9 @@
     (pad 1 smd rect (at 4.5 0 90) (size 0.28 2.6) (layers F.Cu F.Paste F.Mask)
       (net 1 HDMI_D2+))
     (pad 18 smd rect (at -4 0 90) (size 0.28 2.6) (layers F.Cu F.Paste F.Mask)
-      (net 246 "Net-(C30-Pad1)"))
+      (net 238 "Net-(C30-Pad1)"))
     (pad 19 smd rect (at -4.5 0 90) (size 0.28 2.6) (layers F.Cu F.Paste F.Mask)
-      (net 290 "Net-(J4-Pad19)"))
+      (net 282 "Net-(J4-Pad19)"))
     (model /home/mntmn/code/zz9000/3d_models/685119134923--3DModel-STEP-56544.STEP
       (offset (xyz 0 -3 3.4))
       (scale (xyz 1 1 1))
@@ -3939,13 +4316,13 @@
     (pad 5 smd rect (at -5.775 3.4) (size 4.6 1.1) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 4 smd rect (at -5.775 1.7) (size 4.6 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad 3 smd rect (at -5.775 0) (size 4.6 1.1) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 2 smd rect (at -5.775 -1.7) (size 4.6 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 444 "Net-(D21-Pad1)"))
+      (net 436 "Net-(D21-Pad1)"))
     (pad 1 smd rect (at -5.775 -3.4) (size 4.6 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 237 "Net-(C16-Pad1)"))
+      (net 229 "Net-(C16-Pad1)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/TO-263-5_TabPin6.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4009,13 +4386,13 @@
     (pad 5 smd rect (at -5.775 3.4) (size 4.6 1.1) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 4 smd rect (at -5.775 1.7) (size 4.6 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 238 +5V))
+      (net 230 +5V))
     (pad 3 smd rect (at -5.775 0) (size 4.6 1.1) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 2 smd rect (at -5.775 -1.7) (size 4.6 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 443 "Net-(D20-Pad1)"))
+      (net 435 "Net-(D20-Pad1)"))
     (pad 1 smd rect (at -5.775 -3.4) (size 4.6 1.1) (layers F.Cu F.Paste F.Mask)
-      (net 237 "Net-(C16-Pad1)"))
+      (net 229 "Net-(C16-Pad1)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/TO-263-5_TabPin6.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4058,7 +4435,7 @@
     (pad 2 smd rect (at 2 0) (size 2.5 1.8) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 1 smd rect (at -2 0) (size 2.5 1.8) (layers F.Cu F.Paste F.Mask)
-      (net 444 "Net-(D21-Pad1)"))
+      (net 436 "Net-(D21-Pad1)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SMA.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4101,7 +4478,7 @@
     (pad 2 smd rect (at 2 0) (size 2.5 1.8) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 1 smd rect (at -2 0) (size 2.5 1.8) (layers F.Cu F.Paste F.Mask)
-      (net 443 "Net-(D20-Pad1)"))
+      (net 435 "Net-(D20-Pad1)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SMA.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4110,7 +4487,7 @@
   )
 
   (module Package_SO:TSSOP-28_4.4x9.7mm_P0.65mm (layer F.Cu) (tedit 5A02F25C) (tstamp 5D0DF40A)
-    (at 291.5 96)
+    (at 291.5 88)
     (descr "TSSOP28: plastic thin shrink small outline package; 28 leads; body width 4.4 mm; (see NXP SSOP-TSSOP-VSO-REFLOW.pdf and sot361-1_po.pdf)")
     (tags "SSOP 0.65")
     (path /5D1F6C04/5DC002F7)
@@ -4141,61 +4518,61 @@
     (fp_line (start 2.2 -4.85) (end 2.2 4.85) (layer F.Fab) (width 0.15))
     (fp_line (start -1.2 -4.85) (end 2.2 -4.85) (layer F.Fab) (width 0.15))
     (pad 28 smd rect (at 2.85 -4.225) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 542 "Net-(U17-Pad28)"))
+      (net 534 "Net-(U17-Pad28)"))
     (pad 27 smd rect (at 2.85 -3.575) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 543 "Net-(U17-Pad27)"))
+      (net 535 "Net-(U17-Pad27)"))
     (pad 26 smd rect (at 2.85 -2.925) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 544 "Net-(U17-Pad26)"))
+      (net 536 "Net-(U17-Pad26)"))
     (pad 25 smd rect (at 2.85 -2.275) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 545 "Net-(U17-Pad25)"))
+      (net 537 "Net-(U17-Pad25)"))
     (pad 24 smd rect (at 2.85 -1.625) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 546 "Net-(U17-Pad24)"))
+      (net 538 "Net-(U17-Pad24)"))
     (pad 23 smd rect (at 2.85 -0.975) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 547 "Net-(U17-Pad23)"))
+      (net 539 "Net-(U17-Pad23)"))
     (pad 22 smd rect (at 2.85 -0.325) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 548 "Net-(U17-Pad22)"))
+      (net 540 "Net-(U17-Pad22)"))
     (pad 21 smd rect (at 2.85 0.325) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 549 "Net-(U17-Pad21)"))
+      (net 541 "Net-(U17-Pad21)"))
     (pad 20 smd rect (at 2.85 0.975) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 550 "Net-(U17-Pad20)"))
+      (net 542 "Net-(U17-Pad20)"))
     (pad 19 smd rect (at 2.85 1.625) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 551 "Net-(U17-Pad19)"))
+      (net 543 "Net-(U17-Pad19)"))
     (pad 18 smd rect (at 2.85 2.275) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 552 "Net-(U17-Pad18)"))
+      (net 544 "Net-(U17-Pad18)"))
     (pad 17 smd rect (at 2.85 2.925) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 553 "Net-(U17-Pad17)"))
+      (net 545 "Net-(U17-Pad17)"))
     (pad 16 smd rect (at 2.85 3.575) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 554 "Net-(U17-Pad16)"))
+      (net 546 "Net-(U17-Pad16)"))
     (pad 15 smd rect (at 2.85 4.225) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 555 "Net-(U17-Pad15)"))
+      (net 547 "Net-(U17-Pad15)"))
     (pad 14 smd rect (at -2.85 4.225) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 556 "Net-(U17-Pad14)"))
+      (net 548 "Net-(U17-Pad14)"))
     (pad 13 smd rect (at -2.85 3.575) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 557 "Net-(U17-Pad13)"))
+      (net 549 "Net-(U17-Pad13)"))
     (pad 12 smd rect (at -2.85 2.925) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 558 "Net-(U17-Pad12)"))
+      (net 550 "Net-(U17-Pad12)"))
     (pad 11 smd rect (at -2.85 2.275) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 559 "Net-(U17-Pad11)"))
+      (net 551 "Net-(U17-Pad11)"))
     (pad 10 smd rect (at -2.85 1.625) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 560 "Net-(U17-Pad10)"))
+      (net 552 "Net-(U17-Pad10)"))
     (pad 9 smd rect (at -2.85 0.975) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 561 "Net-(U17-Pad9)"))
+      (net 553 "Net-(U17-Pad9)"))
     (pad 8 smd rect (at -2.85 0.325) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 562 "Net-(U17-Pad8)"))
+      (net 554 "Net-(U17-Pad8)"))
     (pad 7 smd rect (at -2.85 -0.325) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 563 "Net-(U17-Pad7)"))
+      (net 555 "Net-(U17-Pad7)"))
     (pad 6 smd rect (at -2.85 -0.975) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 564 "Net-(U17-Pad6)"))
+      (net 556 "Net-(U17-Pad6)"))
     (pad 5 smd rect (at -2.85 -1.625) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 565 "Net-(U17-Pad5)"))
+      (net 557 "Net-(U17-Pad5)"))
     (pad 4 smd rect (at -2.85 -2.275) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 566 "Net-(U17-Pad4)"))
+      (net 558 "Net-(U17-Pad4)"))
     (pad 3 smd rect (at -2.85 -2.925) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 567 "Net-(U17-Pad3)"))
+      (net 559 "Net-(U17-Pad3)"))
     (pad 2 smd rect (at -2.85 -3.575) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 568 "Net-(U17-Pad2)"))
+      (net 560 "Net-(U17-Pad2)"))
     (pad 1 smd rect (at -2.85 -4.225) (size 1.1 0.4) (layers F.Cu F.Paste F.Mask)
-      (net 569 "Net-(U17-Pad1)"))
+      (net 561 "Net-(U17-Pad1)"))
     (model ${KISYS3DMOD}/Package_SO.3dshapes/TSSOP-28_4.4x9.7mm_P0.65mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4204,7 +4581,7 @@
   )
 
   (module Package_SON:VSON-10-1EP_3x3mm_P0.5mm_EP1.65x2.4mm_ThermalVias (layer F.Cu) (tedit 5A65F0B8) (tstamp 5D0DF3D9)
-    (at 142.5 130)
+    (at 124.5 109.5)
     (descr "VSON 10 Thermal on 11 3x3mm Pitch 0.5mm http://chip.tomsk.ru/chip/chipdoc.nsf/Package/D8A64DD165C2AAD9472579400024FC41!OpenDocument")
     (tags "VSON 10 Thermal on 11 3x3mm Pitch 0.5mm")
     (path /5D06A2FD/5DA34B5D)
@@ -4237,53 +4614,53 @@
       (effects (font (size 0.8 0.8) (thickness 0.1)))
     )
     (pad 11 smd rect (at 0 0) (size 1.65 2.4) (layers B.Cu)
-      (net 531 "Net-(U16-Pad11)"))
+      (net 523 "Net-(U16-Pad11)"))
     (pad 11 thru_hole circle (at 0 0) (size 0.6 0.6) (drill 0.3) (layers *.Cu)
-      (net 531 "Net-(U16-Pad11)"))
+      (net 523 "Net-(U16-Pad11)"))
     (pad 11 thru_hole circle (at 0.48 0.86) (size 0.6 0.6) (drill 0.3) (layers *.Cu)
-      (net 531 "Net-(U16-Pad11)"))
+      (net 523 "Net-(U16-Pad11)"))
     (pad 11 thru_hole circle (at 0.48 -0.86) (size 0.6 0.6) (drill 0.3) (layers *.Cu)
-      (net 531 "Net-(U16-Pad11)"))
+      (net 523 "Net-(U16-Pad11)"))
     (pad 11 thru_hole circle (at -0.48 0.86) (size 0.6 0.6) (drill 0.3) (layers *.Cu)
-      (net 531 "Net-(U16-Pad11)"))
+      (net 523 "Net-(U16-Pad11)"))
     (pad 11 thru_hole circle (at -0.48 -0.86) (size 0.6 0.6) (drill 0.3) (layers *.Cu)
-      (net 531 "Net-(U16-Pad11)"))
+      (net 523 "Net-(U16-Pad11)"))
     (pad "" smd rect (at 0.48 -0.86) (size 0.64 0.64) (layers F.Paste))
     (pad "" smd rect (at -0.48 -0.86) (size 0.64 0.64) (layers F.Paste))
     (pad "" smd rect (at 0.48 0) (size 0.64 0.64) (layers F.Paste))
     (pad "" smd rect (at -0.48 0) (size 0.64 0.64) (layers F.Paste))
     (pad "" smd rect (at -0.48 0.86) (size 0.64 0.64) (layers F.Paste))
     (pad 11 smd rect (at 0.25 1.55) (size 0.28 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 531 "Net-(U16-Pad11)"))
+      (net 523 "Net-(U16-Pad11)"))
     (pad 11 smd rect (at 0.25 -1.55) (size 0.28 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 531 "Net-(U16-Pad11)"))
+      (net 523 "Net-(U16-Pad11)"))
     (pad 11 smd rect (at -0.25 1.55) (size 0.28 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 531 "Net-(U16-Pad11)"))
+      (net 523 "Net-(U16-Pad11)"))
     (pad 11 smd rect (at -0.25 -1.55) (size 0.28 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 531 "Net-(U16-Pad11)"))
+      (net 523 "Net-(U16-Pad11)"))
     (pad "" smd rect (at 0.48 0.86) (size 0.64 0.64) (layers F.Paste))
     (pad 11 smd rect (at 0 0) (size 1.65 2.4) (layers F.Cu F.Mask)
-      (net 531 "Net-(U16-Pad11)"))
+      (net 523 "Net-(U16-Pad11)"))
     (pad 10 smd rect (at 1.475 -1) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 532 "Net-(U16-Pad10)"))
+      (net 524 "Net-(U16-Pad10)"))
     (pad 9 smd rect (at 1.475 -0.5) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 533 "Net-(U16-Pad9)"))
+      (net 525 "Net-(U16-Pad9)"))
     (pad 8 smd rect (at 1.475 0) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 534 "Net-(U16-Pad8)"))
+      (net 526 "Net-(U16-Pad8)"))
     (pad 7 smd rect (at 1.475 0.5) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 535 "Net-(U16-Pad7)"))
+      (net 527 "Net-(U16-Pad7)"))
     (pad 6 smd rect (at 1.475 1) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 536 "Net-(U16-Pad6)"))
+      (net 528 "Net-(U16-Pad6)"))
     (pad 5 smd rect (at -1.475 1) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 537 "Net-(U16-Pad5)"))
+      (net 529 "Net-(U16-Pad5)"))
     (pad 4 smd rect (at -1.475 0.5) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 538 "Net-(U16-Pad4)"))
+      (net 530 "Net-(U16-Pad4)"))
     (pad 3 smd rect (at -1.475 0) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 539 "Net-(U16-Pad3)"))
+      (net 531 "Net-(U16-Pad3)"))
     (pad 2 smd rect (at -1.475 -0.5) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 540 "Net-(U16-Pad2)"))
+      (net 532 "Net-(U16-Pad2)"))
     (pad 1 smd rect (at -1.475 -1) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 541 "Net-(U16-Pad1)"))
+      (net 533 "Net-(U16-Pad1)"))
     (model ${KISYS3DMOD}/Package_SON.3dshapes/VSON-10-1EP_3x3mm_P0.5mm_EP1.65x2.4mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4292,7 +4669,7 @@
   )
 
   (module Package_SON:VSON-10-1EP_3x3mm_P0.5mm_EP1.65x2.4mm_ThermalVias (layer F.Cu) (tedit 5A65F0B8) (tstamp 5D0DF3A7)
-    (at 61.5 113.5 180)
+    (at 56 108 180)
     (descr "VSON 10 Thermal on 11 3x3mm Pitch 0.5mm http://chip.tomsk.ru/chip/chipdoc.nsf/Package/D8A64DD165C2AAD9472579400024FC41!OpenDocument")
     (tags "VSON 10 Thermal on 11 3x3mm Pitch 0.5mm")
     (path /5D06A2FD/5DA289BD)
@@ -4325,51 +4702,51 @@
       (effects (font (size 0.8 0.8) (thickness 0.1)))
     )
     (pad 11 smd rect (at 0 0 180) (size 1.65 2.4) (layers B.Cu)
-      (net 527 "Net-(U15-Pad11)"))
+      (net 519 "Net-(U15-Pad11)"))
     (pad 11 thru_hole circle (at 0 0 180) (size 0.6 0.6) (drill 0.3) (layers *.Cu)
-      (net 527 "Net-(U15-Pad11)"))
+      (net 519 "Net-(U15-Pad11)"))
     (pad 11 thru_hole circle (at 0.48 0.86 180) (size 0.6 0.6) (drill 0.3) (layers *.Cu)
-      (net 527 "Net-(U15-Pad11)"))
+      (net 519 "Net-(U15-Pad11)"))
     (pad 11 thru_hole circle (at 0.48 -0.86 180) (size 0.6 0.6) (drill 0.3) (layers *.Cu)
-      (net 527 "Net-(U15-Pad11)"))
+      (net 519 "Net-(U15-Pad11)"))
     (pad 11 thru_hole circle (at -0.48 0.86 180) (size 0.6 0.6) (drill 0.3) (layers *.Cu)
-      (net 527 "Net-(U15-Pad11)"))
+      (net 519 "Net-(U15-Pad11)"))
     (pad 11 thru_hole circle (at -0.48 -0.86 180) (size 0.6 0.6) (drill 0.3) (layers *.Cu)
-      (net 527 "Net-(U15-Pad11)"))
+      (net 519 "Net-(U15-Pad11)"))
     (pad "" smd rect (at 0.48 -0.86 180) (size 0.64 0.64) (layers F.Paste))
     (pad "" smd rect (at -0.48 -0.86 180) (size 0.64 0.64) (layers F.Paste))
     (pad "" smd rect (at 0.48 0 180) (size 0.64 0.64) (layers F.Paste))
     (pad "" smd rect (at -0.48 0 180) (size 0.64 0.64) (layers F.Paste))
     (pad "" smd rect (at -0.48 0.86 180) (size 0.64 0.64) (layers F.Paste))
     (pad 11 smd rect (at 0.25 1.55 180) (size 0.28 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 527 "Net-(U15-Pad11)"))
+      (net 519 "Net-(U15-Pad11)"))
     (pad 11 smd rect (at 0.25 -1.55 180) (size 0.28 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 527 "Net-(U15-Pad11)"))
+      (net 519 "Net-(U15-Pad11)"))
     (pad 11 smd rect (at -0.25 1.55 180) (size 0.28 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 527 "Net-(U15-Pad11)"))
+      (net 519 "Net-(U15-Pad11)"))
     (pad 11 smd rect (at -0.25 -1.55 180) (size 0.28 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 527 "Net-(U15-Pad11)"))
+      (net 519 "Net-(U15-Pad11)"))
     (pad "" smd rect (at 0.48 0.86 180) (size 0.64 0.64) (layers F.Paste))
     (pad 11 smd rect (at 0 0 180) (size 1.65 2.4) (layers F.Cu F.Mask)
-      (net 527 "Net-(U15-Pad11)"))
+      (net 519 "Net-(U15-Pad11)"))
     (pad 10 smd rect (at 1.475 -1 180) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 528 "Net-(U15-Pad10)"))
+      (net 520 "Net-(U15-Pad10)"))
     (pad 9 smd rect (at 1.475 -0.5 180) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 463 USB3_1_VBUS))
+      (net 455 USB3_1_VBUS))
     (pad 8 smd rect (at 1.475 0 180) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 456 USB3_2_VBUS))
+      (net 448 USB3_2_VBUS))
     (pad 7 smd rect (at 1.475 0.5 180) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 529 "Net-(U15-Pad7)"))
+      (net 521 "Net-(U15-Pad7)"))
     (pad 6 smd rect (at 1.475 1 180) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 530 "Net-(U15-Pad6)"))
+      (net 522 "Net-(U15-Pad6)"))
     (pad 5 smd rect (at -1.475 1 180) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 507 USB3_2_EN))
+      (net 499 USB3_2_EN))
     (pad 4 smd rect (at -1.475 0.5 180) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 506 USB3_1_EN))
+      (net 498 USB3_1_EN))
     (pad 3 smd rect (at -1.475 0 180) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 238 +5V))
+      (net 230 +5V))
     (pad 2 smd rect (at -1.475 -0.5 180) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
-      (net 238 +5V))
+      (net 230 +5V))
     (pad 1 smd rect (at -1.475 -1 180) (size 0.85 0.28) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (model ${KISYS3DMOD}/Package_SON.3dshapes/VSON-10-1EP_3x3mm_P0.5mm_EP1.65x2.4mm.wrl
@@ -4406,15 +4783,15 @@
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 5 smd rect (at 1.1 -0.95 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 428 +1V1))
+      (net 420 +1V1))
     (pad 4 smd rect (at 1.1 0.95 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 526 "Net-(U14-Pad4)"))
+      (net 518 "Net-(U14-Pad4)"))
     (pad 3 smd rect (at -1.1 0.95 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad 2 smd rect (at -1.1 0 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 1 smd rect (at -1.1 -0.95 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23-5.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4449,15 +4826,15 @@
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 5 smd rect (at 1.1 -0.95 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 427 +1V2))
+      (net 419 +1V2))
     (pad 4 smd rect (at 1.1 0.95 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 525 "Net-(U13-Pad4)"))
+      (net 517 "Net-(U13-Pad4)"))
     (pad 3 smd rect (at -1.1 0.95 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad 2 smd rect (at -1.1 0 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 1 smd rect (at -1.1 -0.95 180) (size 1.06 0.65) (layers F.Cu F.Paste F.Mask)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23-5.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4466,7 +4843,7 @@
   )
 
   (module Package_SO:MSOP-8_3x3mm_P0.65mm (layer F.Cu) (tedit 5A02F25C) (tstamp 5D0DEFDA)
-    (at 277 84.5 270)
+    (at 276.5 55.5 270)
     (descr "8-Lead Plastic Micro Small Outline Package (MS) [MSOP] (see Microchip Packaging Specification 00000049BS.pdf)")
     (tags "SSOP 0.65")
     (path /5CC81028/5DC4F376)
@@ -4497,21 +4874,21 @@
     (fp_line (start 1.5 -1.5) (end 1.5 1.5) (layer F.Fab) (width 0.15))
     (fp_line (start -0.5 -1.5) (end 1.5 -1.5) (layer F.Fab) (width 0.15))
     (pad 8 smd rect (at 2.2 -0.975 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 237 "Net-(C16-Pad1)"))
+      (net 229 "Net-(C16-Pad1)"))
     (pad 7 smd rect (at 2.2 -0.325 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 504 "Net-(U5-Pad7)"))
+      (net 496 "Net-(U5-Pad7)"))
     (pad 6 smd rect (at 2.2 0.325 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 478 "Net-(R54-Pad2)"))
+      (net 470 "Net-(R54-Pad2)"))
     (pad 5 smd rect (at 2.2 0.975 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 505 "Net-(U5-Pad5)"))
+      (net 497 "Net-(U5-Pad5)"))
     (pad 4 smd rect (at -2.2 0.975 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 306 BATPWR))
+      (net 298 BATPWR))
     (pad 3 smd rect (at -2.2 0.325 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 358 "Net-(U5-Pad3)"))
+      (net 350 "Net-(U5-Pad3)"))
     (pad 2 smd rect (at -2.2 -0.325 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 442 "Net-(D19-Pad2)"))
+      (net 434 "Net-(D19-Pad2)"))
     (pad 1 smd rect (at -2.2 -0.975 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 441 "Net-(D19-Pad1)"))
+      (net 433 "Net-(D19-Pad1)"))
     (model ${KISYS3DMOD}/Package_SO.3dshapes/MSOP-8_3x3mm_P0.65mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4520,7 +4897,7 @@
   )
 
   (module Package_SO:MSOP-8_3x3mm_P0.65mm (layer F.Cu) (tedit 5A02F25C) (tstamp 5D0DEF3D)
-    (at 285 80.5 270)
+    (at 284.5 51.5 270)
     (descr "8-Lead Plastic Micro Small Outline Package (MS) [MSOP] (see Microchip Packaging Specification 00000049BS.pdf)")
     (tags "SSOP 0.65")
     (path /5CC81028/5E00CDAA)
@@ -4551,21 +4928,21 @@
     (fp_line (start 1.5 -1.5) (end 1.5 1.5) (layer F.Fab) (width 0.15))
     (fp_line (start -0.5 -1.5) (end 1.5 -1.5) (layer F.Fab) (width 0.15))
     (pad 8 smd rect (at 2.2 -0.975 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 237 "Net-(C16-Pad1)"))
+      (net 229 "Net-(C16-Pad1)"))
     (pad 7 smd rect (at 2.2 -0.325 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 501 "Net-(U3-Pad7)"))
+      (net 493 "Net-(U3-Pad7)"))
     (pad 6 smd rect (at 2.2 0.325 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 476 "Net-(R51-Pad2)"))
+      (net 468 "Net-(R51-Pad2)"))
     (pad 5 smd rect (at 2.2 0.975 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 502 "Net-(U3-Pad5)"))
+      (net 494 "Net-(U3-Pad5)"))
     (pad 4 smd rect (at -2.2 0.975 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 447 "Net-(F1-Pad1)"))
+      (net 439 "Net-(F1-Pad1)"))
     (pad 3 smd rect (at -2.2 0.325 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 347 "Net-(U3-Pad3)"))
+      (net 339 "Net-(U3-Pad3)"))
     (pad 2 smd rect (at -2.2 -0.325 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 447 "Net-(F1-Pad1)"))
+      (net 439 "Net-(F1-Pad1)"))
     (pad 1 smd rect (at -2.2 -0.975 270) (size 1.45 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 305 "Net-(Q3-Pad1)"))
+      (net 297 "Net-(Q3-Pad1)"))
     (model ${KISYS3DMOD}/Package_SO.3dshapes/MSOP-8_3x3mm_P0.65mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4573,8 +4950,8 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD4B3)
-    (at 88.5 54 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D1CCBEF)
+    (at 97.5 53.5 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06AC46/5DB66E46)
@@ -4599,9 +4976,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 445 "Net-(D22-Pad2)"))
+      (net 437 "Net-(D22-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4610,7 +4987,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD4A2)
-    (at 231.5 43.5)
+    (at 89 81.5 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06A7B6/5DAB7962)
@@ -4634,10 +5011,10 @@
     (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 488 EDP_SDA))
-    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 487 +1V8))
+    (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 480 EDP_SDA))
+    (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 479 +1V8))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4646,7 +5023,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D1102CA)
-    (at 231.5 46.5)
+    (at 85.5 81.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06A7B6/5DAB5CC1)
@@ -4671,9 +5048,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 486 EDP_SCL))
+      (net 478 EDP_SCL))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 487 +1V8))
+      (net 479 +1V8))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4682,18 +5059,18 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD480)
-    (at 210.5 55 90)
+    (at 81 55 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06A7B6/5DAA503E)
     (attr smd)
-    (fp_text reference R64 (at 0 -1.43 90) (layer F.SilkS)
+    (fp_text reference R64 (at 0 -1.43) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 51k (at 0 1.43 90) (layer F.Fab)
+    (fp_text value 51k (at 0 1.43) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
+    (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.4 0.4) (thickness 0.06)))
     )
     (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
@@ -4706,10 +5083,10 @@
     (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 485 "Net-(R64-Pad2)"))
-    (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 278 "/Reform 2 Display/EDP_HPD"))
+    (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 477 "Net-(R64-Pad2)"))
+    (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 270 "/Reform 2 Display/EDP_HPD"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4718,7 +5095,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD46F)
-    (at 94.28 117.46)
+    (at 86.28 106.46)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06A2FD/5DA6B593)
@@ -4745,7 +5122,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 484 "Net-(R63-Pad1)"))
+      (net 476 "Net-(R63-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4754,7 +5131,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD45E)
-    (at 72.66 118.8)
+    (at 65.66 108.8)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06A2FD/5D9E8B2B)
@@ -4781,7 +5158,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 483 "Net-(R61-Pad1)"))
+      (net 475 "Net-(R61-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4790,7 +5167,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD44D)
-    (at 98.29 117.46)
+    (at 90.29 106.46)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06A2FD/5D9E866F)
@@ -4815,9 +5192,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 437 USB_PWR))
+      (net 429 USB_PWR))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 483 "Net-(R61-Pad1)"))
+      (net 475 "Net-(R61-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4826,7 +5203,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD43C)
-    (at 76.67 118.8)
+    (at 69.67 108.8)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06A2FD/5DB86F24)
@@ -4853,7 +5230,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 482 "Net-(R60-Pad1)"))
+      (net 474 "Net-(R60-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4862,7 +5239,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD42B)
-    (at 98.29 122.48)
+    (at 90.29 111.48)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06A2FD/5D9E4389)
@@ -4889,7 +5266,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 481 "Net-(R59-Pad1)"))
+      (net 473 "Net-(R59-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4898,7 +5275,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD41A)
-    (at 94.28 124.99)
+    (at 86.28 113.99)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06A2FD/5D9E4EC1)
@@ -4925,7 +5302,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 480 "Net-(R58-Pad1)"))
+      (net 472 "Net-(R58-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4934,7 +5311,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD409)
-    (at 72.66 121.31)
+    (at 65.66 111.31)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06A2FD/5DA64888)
@@ -4961,7 +5338,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 479 "Net-(R57-Pad1)"))
+      (net 471 "Net-(R57-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4970,7 +5347,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD3F8)
-    (at 98.29 119.97)
+    (at 90.29 108.97)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06A2FD/5DA23903)
@@ -4997,7 +5374,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 451 "Net-(J5-Pad10)"))
+      (net 443 "Net-(J5-Pad10)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5006,7 +5383,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD3E7)
-    (at 68.63 113.8)
+    (at 61.63 103.8)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06A2FD/5DA0DCB3)
@@ -5033,7 +5410,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 457 "Net-(J6-Pad10)"))
+      (net 449 "Net-(J6-Pad10)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5042,7 +5419,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD3D6)
-    (at 277 89.5 180)
+    (at 276.5 60.5 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5DEE99E5)
@@ -5067,7 +5444,7 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 478 "Net-(R54-Pad2)"))
+      (net 470 "Net-(R54-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
@@ -5078,7 +5455,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD3C5)
-    (at 273 77.5 90)
+    (at 272.5 48.5 90)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5DF4E7F0)
@@ -5103,9 +5480,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 306 BATPWR))
+      (net 298 BATPWR))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 442 "Net-(D19-Pad2)"))
+      (net 434 "Net-(D19-Pad2)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5114,7 +5491,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD3B4)
-    (at 241 113.5 90)
+    (at 228 112 90)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D967430)
@@ -5139,9 +5516,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 223 "Net-(BT1-Pad1)"))
+      (net 674 BAT1+))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 477 "Net-(R52-Pad1)"))
+      (net 469 "Net-(R52-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5150,7 +5527,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD3A3)
-    (at 285 85.5 90)
+    (at 284.5 56.5 90)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5E310279)
@@ -5175,7 +5552,7 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 476 "Net-(R51-Pad2)"))
+      (net 468 "Net-(R51-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
@@ -5186,7 +5563,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD392)
-    (at 282 127)
+    (at 256.5 117)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D61F80C)
@@ -5213,7 +5590,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 474 "Net-(R3-Pad1)"))
+      (net 466 "Net-(R3-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5222,7 +5599,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DD381)
-    (at 284 125)
+    (at 258.5 115)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D61F289)
@@ -5249,7 +5626,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 475 "Net-(R49-Pad1)"))
+      (net 467 "Net-(R49-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5258,7 +5635,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0DCDD0)
-    (at 280.5 124.5 180)
+    (at 255 114.5 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D61FB34)
@@ -5283,9 +5660,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 473 "Net-(R3-Pad2)"))
+      (net 465 "Net-(R3-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 474 "Net-(R3-Pad1)"))
+      (net 466 "Net-(R3-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5294,7 +5671,7 @@
   )
 
   (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5D0DCD7F)
-    (at 280 77.5 180)
+    (at 279.5 48.5 180)
     (descr "SOT-23, Standard")
     (tags SOT-23)
     (path /5CC81028/5DCF2DFD)
@@ -5322,11 +5699,11 @@
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 3 smd rect (at 1 0 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 237 "Net-(C16-Pad1)"))
+      (net 229 "Net-(C16-Pad1)"))
     (pad 2 smd rect (at -1 0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 442 "Net-(D19-Pad2)"))
+      (net 434 "Net-(D19-Pad2)"))
     (pad 1 smd rect (at -1 -0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 441 "Net-(D19-Pad1)"))
+      (net 433 "Net-(D19-Pad1)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5335,7 +5712,7 @@
   )
 
   (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5D0DCCCA)
-    (at 276 77.5 180)
+    (at 275.5 48.5 180)
     (descr "SOT-23, Standard")
     (tags SOT-23)
     (path /5CC81028/5DCF0EB9)
@@ -5363,11 +5740,11 @@
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 3 smd rect (at 1 0 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 306 BATPWR))
+      (net 298 BATPWR))
     (pad 2 smd rect (at -1 0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 442 "Net-(D19-Pad2)"))
+      (net 434 "Net-(D19-Pad2)"))
     (pad 1 smd rect (at -1 -0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 441 "Net-(D19-Pad1)"))
+      (net 433 "Net-(D19-Pad1)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5376,7 +5753,7 @@
   )
 
   (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5D0DCCB5)
-    (at 285 74.5 180)
+    (at 284.5 45.5 180)
     (descr "SOT-23, Standard")
     (tags SOT-23)
     (path /5CC81028/5DC902F4)
@@ -5404,11 +5781,11 @@
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 3 smd rect (at 1 0 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 237 "Net-(C16-Pad1)"))
+      (net 229 "Net-(C16-Pad1)"))
     (pad 2 smd rect (at -1 0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 447 "Net-(F1-Pad1)"))
+      (net 439 "Net-(F1-Pad1)"))
     (pad 1 smd rect (at -1 -0.95 180) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 305 "Net-(Q3-Pad1)"))
+      (net 297 "Net-(Q3-Pad1)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5417,7 +5794,7 @@
   )
 
   (module Package_SO:SOIC-8_3.9x4.9mm_P1.27mm (layer F.Cu) (tedit 5C97300E) (tstamp 5D0DCCA0)
-    (at 282 110 90)
+    (at 256.5 100 90)
     (descr "SOIC, 8 Pin (JEDEC MS-012AA, https://www.analog.com/media/en/package-pcb-resources/package/pkg_pdf/soic_narrow-r/r_8.pdf), generated with kicad-footprint-generator ipc_gullwing_generator.py")
     (tags "SOIC SO")
     (path /5CC81028/5D63D106)
@@ -5445,21 +5822,21 @@
     (fp_line (start 0 2.56) (end -1.95 2.56) (layer F.SilkS) (width 0.12))
     (fp_line (start 0 2.56) (end 1.95 2.56) (layer F.SilkS) (width 0.12))
     (pad 8 smd roundrect (at 2.475 -1.905 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 426 "Net-(C34-Pad1)"))
+      (net 418 "Net-(C34-Pad1)"))
     (pad 7 smd roundrect (at 2.475 -0.635 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 426 "Net-(C34-Pad1)"))
+      (net 418 "Net-(C34-Pad1)"))
     (pad 6 smd roundrect (at 2.475 0.635 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 426 "Net-(C34-Pad1)"))
+      (net 418 "Net-(C34-Pad1)"))
     (pad 5 smd roundrect (at 2.475 1.905 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 426 "Net-(C34-Pad1)"))
+      (net 418 "Net-(C34-Pad1)"))
     (pad 4 smd roundrect (at -2.475 1.905 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 472 "Net-(Q2-Pad4)"))
+      (net 464 "Net-(Q2-Pad4)"))
     (pad 3 smd roundrect (at -2.475 0.635 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 293 "Net-(L1-Pad2)"))
+      (net 285 "Net-(L1-Pad2)"))
     (pad 2 smd roundrect (at -2.475 -0.635 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 293 "Net-(L1-Pad2)"))
+      (net 285 "Net-(L1-Pad2)"))
     (pad 1 smd roundrect (at -2.475 -1.905 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 293 "Net-(L1-Pad2)"))
+      (net 285 "Net-(L1-Pad2)"))
     (model ${KISYS3DMOD}/Package_SO.3dshapes/SOIC-8_3.9x4.9mm_P1.27mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5468,7 +5845,7 @@
   )
 
   (module Package_SO:SOIC-8_3.9x4.9mm_P1.27mm (layer F.Cu) (tedit 5C97300E) (tstamp 5D0DCC86)
-    (at 273.5 120 90)
+    (at 248 110 90)
     (descr "SOIC, 8 Pin (JEDEC MS-012AA, https://www.analog.com/media/en/package-pcb-resources/package/pkg_pdf/soic_narrow-r/r_8.pdf), generated with kicad-footprint-generator ipc_gullwing_generator.py")
     (tags "SOIC SO")
     (path /5CC81028/5D601E86)
@@ -5496,21 +5873,21 @@
     (fp_line (start 0 2.56) (end -1.95 2.56) (layer F.SilkS) (width 0.12))
     (fp_line (start 0 2.56) (end 1.95 2.56) (layer F.SilkS) (width 0.12))
     (pad 8 smd roundrect (at 2.475 -1.905 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 470 "Net-(Q1-Pad5)"))
+      (net 462 "Net-(Q1-Pad5)"))
     (pad 7 smd roundrect (at 2.475 -0.635 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 470 "Net-(Q1-Pad5)"))
+      (net 462 "Net-(Q1-Pad5)"))
     (pad 6 smd roundrect (at 2.475 0.635 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 470 "Net-(Q1-Pad5)"))
+      (net 462 "Net-(Q1-Pad5)"))
     (pad 5 smd roundrect (at 2.475 1.905 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 470 "Net-(Q1-Pad5)"))
+      (net 462 "Net-(Q1-Pad5)"))
     (pad 4 smd roundrect (at -2.475 1.905 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 471 "Net-(Q1-Pad4)"))
+      (net 463 "Net-(Q1-Pad4)"))
     (pad 3 smd roundrect (at -2.475 0.635 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 423 +36V))
+      (net 415 +36V))
     (pad 2 smd roundrect (at -2.475 -0.635 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 423 +36V))
+      (net 415 +36V))
     (pad 1 smd roundrect (at -2.475 -1.905 90) (size 1.95 0.6) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 423 +36V))
+      (net 415 +36V))
     (model ${KISYS3DMOD}/Package_SO.3dshapes/SOIC-8_3.9x4.9mm_P1.27mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5519,7 +5896,7 @@
   )
 
   (module footprints:SJ-43516-SMT (layer F.Cu) (tedit 5A1D8B53) (tstamp 5D0DCBC2)
-    (at 307.5 96 180)
+    (at 307.5 88 180)
     (path /5D1F6C04/5DC02AC6)
     (attr smd)
     (fp_text reference J7 (at -5.5 -6.55) (layer F.SilkS)
@@ -5546,17 +5923,17 @@
     (pad Hole np_thru_hole circle (at -3.5 0 180) (size 1.7 1.7) (drill 1.7) (layers))
     (pad Hole np_thru_hole circle (at 3.5 0 180) (size 1.7 1.7) (drill 1.7) (layers))
     (pad 5 smd rect (at 8.9 -0.75 180) (size 2.8 2.8) (layers F.Cu F.Paste F.Mask)
-      (net 464 "Net-(J7-Pad5)"))
+      (net 456 "Net-(J7-Pad5)"))
     (pad 3 smd rect (at -2.7 -3.7 180) (size 2 2.8) (layers F.Cu F.Paste F.Mask)
-      (net 465 "Net-(J7-Pad3)"))
+      (net 457 "Net-(J7-Pad3)"))
     (pad 6 smd rect (at -5.5 -3.7 180) (size 2 2.8) (layers F.Cu F.Paste F.Mask)
-      (net 466 "Net-(J7-Pad6)"))
+      (net 458 "Net-(J7-Pad6)"))
     (pad 1 smd rect (at -7.4 3.7 180) (size 2 2.8) (layers F.Cu F.Paste F.Mask)
-      (net 467 "Net-(J7-Pad1)"))
+      (net 459 "Net-(J7-Pad1)"))
     (pad 4 smd rect (at -4.6 3.7 180) (size 2 2.8) (layers F.Cu F.Paste F.Mask)
-      (net 468 "Net-(J7-Pad4)"))
+      (net 460 "Net-(J7-Pad4)"))
     (pad 2 smd rect (at 4.8 3.7 180) (size 2.8 2.8) (layers F.Cu F.Paste F.Mask)
-      (net 469 "Net-(J7-Pad2)"))
+      (net 461 "Net-(J7-Pad2)"))
     (model ${KIPRJMOD}/3d-models/CUI_SJ-43516-SMT-TR.step
       (offset (xyz -8 0 2.6))
       (scale (xyz 1 1 1))
@@ -5565,7 +5942,7 @@
   )
 
   (module Connector_USB:USB3_A_Molex_48393-001 (layer F.Cu) (tedit 5A142044) (tstamp 5D1316B2)
-    (at 50.5 99 270)
+    (at 50.5 91.5 270)
     (descr "USB 3.0, type A, right angle (http://www.molex.com/pdm_docs/sd/483930003_sd.pdf)")
     (tags "USB 3.0 type A right angle")
     (path /5D06A2FD/5DA00825)
@@ -5595,31 +5972,31 @@
     (fp_line (start 10.46 -2.56) (end 10.46 -1.85) (layer F.SilkS) (width 0.12))
     (fp_line (start -3.46 -2.56) (end -3.46 -1.85) (layer F.SilkS) (width 0.12))
     (pad 10 thru_hole oval (at -2.9 7.75 270) (size 1.2 2.1) (drill oval 0.6 1.4) (layers *.Cu *.Mask)
-      (net 457 "Net-(J6-Pad10)"))
+      (net 449 "Net-(J6-Pad10)"))
     (pad 10 thru_hole oval (at 9.9 7.75 270) (size 1.2 2.1) (drill oval 0.6 1.4) (layers *.Cu *.Mask)
-      (net 457 "Net-(J6-Pad10)"))
+      (net 449 "Net-(J6-Pad10)"))
     (pad 10 thru_hole oval (at -2.9 -0.75 270) (size 1.2 2.4) (drill oval 0.6 1.7) (layers *.Cu *.Mask)
-      (net 457 "Net-(J6-Pad10)"))
+      (net 449 "Net-(J6-Pad10)"))
     (pad 10 thru_hole oval (at 9.9 -0.75 270) (size 1.2 2.4) (drill oval 0.6 1.7) (layers *.Cu *.Mask)
-      (net 457 "Net-(J6-Pad10)"))
+      (net 449 "Net-(J6-Pad10)"))
     (pad 9 thru_hole circle (at -0.5 -1.5 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 435 "Net-(C42-Pad2)"))
+      (net 427 "Net-(C42-Pad2)"))
     (pad 8 thru_hole circle (at 1.5 -1.5 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 431 "Net-(C40-Pad2)"))
+      (net 423 "Net-(C40-Pad2)"))
     (pad 7 thru_hole circle (at 3.5 -1.5 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 458 "Net-(J6-Pad7)"))
+      (net 450 "Net-(J6-Pad7)"))
     (pad 6 thru_hole circle (at 5.5 -1.5 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 459 USB3_1_SSRXP))
+      (net 451 USB3_1_SSRXP))
     (pad 5 thru_hole circle (at 7.5 -1.5 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 460 USB3_1_SSRXN))
+      (net 452 USB3_1_SSRXN))
     (pad 4 thru_hole circle (at 7 0 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
       (net 40 GND))
     (pad 3 thru_hole circle (at 4.5 0 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 461 USB3_1_DP))
+      (net 453 USB3_1_DP))
     (pad 2 thru_hole circle (at 2.5 0 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 462 USB3_1_DN))
+      (net 454 USB3_1_DN))
     (pad 1 thru_hole circle (at 0 0 270) (size 1.2 1.2) (drill 0.7) (layers *.Cu *.Mask)
-      (net 463 USB3_1_VBUS))
+      (net 455 USB3_1_VBUS))
     (model ${KIPRJMOD}/3d-models/483930001.stp
       (offset (xyz 3.5 -11.65 0.25))
       (scale (xyz 1 1 1))
@@ -5653,9 +6030,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 573 "Net-(C58-Pad1)"))
+      (net 565 "Net-(C58-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5663,8 +6040,8 @@
     )
   )
 
-  (module Inductor_SMD:L_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC9A4)
-    (at 116 56 180)
+  (module Inductor_SMD:L_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D1CCDB4)
+    (at 125 55.5 180)
     (descr "Inductor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags inductor)
     (path /5D06AC46/5DAC08FC)
@@ -5689,9 +6066,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 572 "Net-(C52-Pad1)"))
+      (net 564 "Net-(C52-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5700,7 +6077,7 @@
   )
 
   (module Inductor_SMD:L_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC993)
-    (at 68.65 121.31)
+    (at 61.65 111.31)
     (descr "Inductor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags inductor)
     (path /5D06A2FD/5DA4FAF9)
@@ -5725,9 +6102,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 450 "Net-(FB2-Pad2)"))
+      (net 442 "Net-(FB2-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 428 +1V1))
+      (net 420 +1V1))
     (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5736,7 +6113,7 @@
   )
 
   (module Inductor_SMD:L_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC982)
-    (at 94.28 122.48)
+    (at 86.28 111.48)
     (descr "Inductor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags inductor)
     (path /5D06A2FD/5DA53C5D)
@@ -5761,9 +6138,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 449 "Net-(FB1-Pad2)"))
+      (net 441 "Net-(FB1-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5772,7 +6149,7 @@
   )
 
   (module Fuse:Fuse_2920_7451Metric (layer F.Cu) (tedit 5B341557) (tstamp 5D0DC971)
-    (at 304 129 90)
+    (at 278.5 112 90)
     (descr "Fuse SMD 2920 (7451 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://www.megastar.com/products/fusetronic/polyswitch/PDF/smd2920.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5DD7EA08)
@@ -5797,9 +6174,9 @@
     (fp_line (start -3.6775 -2.56) (end 3.6775 -2.56) (layer F.Fab) (width 0.1))
     (fp_line (start -3.6775 2.56) (end -3.6775 -2.56) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 3.3875 0 90) (size 1.925 5.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.12987)
-      (net 448 "Net-(F2-Pad2)"))
+      (net 440 "Net-(F2-Pad2)"))
     (pad 1 smd roundrect (at -3.3875 0 90) (size 1.925 5.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.12987)
-      (net 223 "Net-(BT1-Pad1)"))
+      (net 674 BAT1+))
     (model ${KISYS3DMOD}/Fuse.3dshapes/Fuse_2920_7451Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5807,8 +6184,8 @@
     )
   )
 
-  (module Fuse:Fuse_2920_7451Metric (layer F.Cu) (tedit 5B341557) (tstamp 5D0DC960)
-    (at 294.5 78)
+  (module Fuse:Fuse_2920_7451Metric (layer F.Cu) (tedit 5B341557) (tstamp 5D1EC558)
+    (at 294.5 50)
     (descr "Fuse SMD 2920 (7451 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size from: http://www.megastar.com/products/fusetronic/polyswitch/PDF/smd2920.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5DC0FDCA)
@@ -5833,9 +6210,9 @@
     (fp_line (start -3.6775 -2.56) (end 3.6775 -2.56) (layer F.Fab) (width 0.1))
     (fp_line (start -3.6775 2.56) (end -3.6775 -2.56) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 3.3875 0) (size 1.925 5.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.12987)
-      (net 423 +36V))
+      (net 415 +36V))
     (pad 1 smd roundrect (at -3.3875 0) (size 1.925 5.45) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.12987)
-      (net 447 "Net-(F1-Pad1)"))
+      (net 439 "Net-(F1-Pad1)"))
     (model ${KISYS3DMOD}/Fuse.3dshapes/Fuse_2920_7451Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5843,8 +6220,8 @@
     )
   )
 
-  (module LED_SMD:LED_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC93C)
-    (at 85.5 51.5 90)
+  (module LED_SMD:LED_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D1CCD80)
+    (at 127.5 51 90)
     (descr "LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags diode)
     (path /5D06AC46/5DB65D52)
@@ -5871,9 +6248,9 @@
     (fp_line (start -0.5 -0.4) (end -0.8 -0.1) (layer F.Fab) (width 0.1))
     (fp_line (start 0.8 -0.4) (end -0.5 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 445 "Net-(D22-Pad2)"))
+      (net 437 "Net-(D22-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 446 "Net-(D22-Pad1)"))
+      (net 438 "Net-(D22-Pad1)"))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5882,7 +6259,7 @@
   )
 
   (module Diode_SMD:D_SOD-523 (layer F.Cu) (tedit 586419F0) (tstamp 5D0DC8EB)
-    (at 281 82.5 270)
+    (at 280.5 53.5 270)
     (descr "http://www.diodes.com/datasheets/ap02001.pdf p.144")
     (tags "Diode SOD523")
     (path /5CC81028/5E479A21)
@@ -5914,9 +6291,9 @@
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 1 smd rect (at -0.7 0 90) (size 0.6 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 441 "Net-(D19-Pad1)"))
+      (net 433 "Net-(D19-Pad1)"))
     (pad 2 smd rect (at 0.7 0 90) (size 0.6 0.7) (layers F.Cu F.Paste F.Mask)
-      (net 442 "Net-(D19-Pad2)"))
+      (net 434 "Net-(D19-Pad2)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-523.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5925,7 +6302,7 @@
   )
 
   (module Diode_SMD:D_SOD-123 (layer F.Cu) (tedit 58645DC7) (tstamp 5D0635DF)
-    (at 234.5 109.5 90)
+    (at 221.5 108 90)
     (descr SOD-123)
     (tags SOD-123)
     (path /5CC81028/5D310B9F)
@@ -5960,7 +6337,7 @@
     (pad 2 smd rect (at 1.65 0 90) (size 0.9 1.2) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 1 smd rect (at -1.65 0 90) (size 0.9 1.2) (layers F.Cu F.Paste F.Mask)
-      (net 247 "Net-(D1-Pad1)"))
+      (net 239 "Net-(D1-Pad1)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-123.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5969,7 +6346,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC5FD)
-    (at 72.64 113.8)
+    (at 65.64 103.8)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A2FD/5D9FD520)
@@ -5994,9 +6371,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 343 USB1_TX_N))
+      (net 335 USB1_TX_N))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 439 "Net-(C45-Pad1)"))
+      (net 431 "Net-(C45-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6005,7 +6382,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC5EC)
-    (at 68.63 116.31)
+    (at 61.63 106.31)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A2FD/5D9FBA06)
@@ -6030,9 +6407,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 344 USB1_TX_P))
+      (net 336 USB1_TX_P))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 438 "Net-(C44-Pad1)"))
+      (net 430 "Net-(C44-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6041,7 +6418,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC5DB)
-    (at 98.29 114.95)
+    (at 90.29 103.95)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A2FD/5D9E9C3A)
@@ -6068,7 +6445,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 437 USB_PWR))
+      (net 429 USB_PWR))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6077,7 +6454,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC5CA)
-    (at 72.64 116.31)
+    (at 65.64 106.31)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A2FD/5DA15148)
@@ -6102,9 +6479,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 435 "Net-(C42-Pad2)"))
+      (net 427 "Net-(C42-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 436 USB3_1_SSTXP))
+      (net 428 USB3_1_SSTXP))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6113,7 +6490,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC5B9)
-    (at 68.65 118.8)
+    (at 61.65 108.8)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A2FD/5DA23932)
@@ -6138,9 +6515,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 433 "Net-(C41-Pad2)"))
+      (net 425 "Net-(C41-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 434 USB3_2_SSTXP))
+      (net 426 USB3_2_SSTXP))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6149,7 +6526,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC5A8)
-    (at 94.28 119.97)
+    (at 86.28 108.97)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A2FD/5DA14D06)
@@ -6174,9 +6551,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 431 "Net-(C40-Pad2)"))
+      (net 423 "Net-(C40-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 432 USB3_1_SSTXN))
+      (net 424 USB3_1_SSTXN))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6185,7 +6562,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC597)
-    (at 94.28 114.95)
+    (at 86.28 103.95)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A2FD/5DA23928)
@@ -6210,9 +6587,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 429 "Net-(C39-Pad2)"))
+      (net 421 "Net-(C39-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 430 USB3_2_SSTXN))
+      (net 422 USB3_2_SSTXN))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6248,7 +6625,7 @@
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 428 +1V1))
+      (net 420 +1V1))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6284,7 +6661,7 @@
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 427 +1V2))
+      (net 419 +1V2))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6320,7 +6697,7 @@
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6356,7 +6733,7 @@
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6365,7 +6742,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC542)
-    (at 277 110.2875 270)
+    (at 251.5 100.2875 270)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D455841)
@@ -6392,7 +6769,7 @@
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 426 "Net-(C34-Pad1)"))
+      (net 418 "Net-(C34-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6401,7 +6778,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC531)
-    (at 277.5 120 270)
+    (at 252 110 270)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D8CED97)
@@ -6428,7 +6805,7 @@
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 425 "Net-(C33-Pad1)"))
+      (net 417 "Net-(C33-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6437,7 +6814,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC520)
-    (at 277.5 123.5 270)
+    (at 252 113.5 270)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D52225D)
@@ -6464,7 +6841,7 @@
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 424 "Net-(C32-Pad1)"))
+      (net 416 "Net-(C32-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6473,7 +6850,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC50F)
-    (at 269.5 122 90)
+    (at 244 112 90)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D165A91)
@@ -6500,7 +6877,7 @@
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 423 +36V))
+      (net 415 +36V))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6509,7 +6886,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0DC1DE)
-    (at 267.5 122 90)
+    (at 242 112 90)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D1DC14A)
@@ -6536,7 +6913,7 @@
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 423 +36V))
+      (net 415 +36V))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6545,7 +6922,7 @@
   )
 
   (module Crystal:Crystal_SMD_5032-2Pin_5.0x3.2mm (layer F.Cu) (tedit 5A0FD1B2) (tstamp 5D0659BE)
-    (at 85.785 108.81 180)
+    (at 78.285 101.81 180)
     (descr "SMD Crystal SERIES SMD2520/2 http://www.icbase.com/File/PDF/HKC/HKC00061008.pdf, 5.0x3.2mm^2 package")
     (tags "SMD SMT crystal")
     (path /5D06A2FD/5D1A9B07)
@@ -6580,9 +6957,9 @@
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 2 smd rect (at 1.85 0 180) (size 2 2.4) (layers F.Cu F.Paste F.Mask)
-      (net 240 "Net-(C21-Pad1)"))
+      (net 232 "Net-(C21-Pad1)"))
     (pad 1 smd rect (at -1.85 0 180) (size 2 2.4) (layers F.Cu F.Paste F.Mask)
-      (net 239 "Net-(C20-Pad1)"))
+      (net 231 "Net-(C20-Pad1)"))
     (model ${KISYS3DMOD}/Crystal.3dshapes/Crystal_SMD_5032-2Pin_5.0x3.2mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6591,7 +6968,7 @@
   )
 
   (module footprints:TSSOP50P640X120-38N (layer F.Cu) (tedit 5AE8D8CD) (tstamp 5D084641)
-    (at 56.75 49.75 180)
+    (at 56.75 55.75 180)
     (path /5D0D8363/5D124B0E)
     (attr smd)
     (fp_text reference U?1 (at -4.65 -0.075 90) (layer F.SilkS)
@@ -6621,9 +6998,9 @@
     (fp_circle (center -3.023 -5) (end -2.943 -5) (layer F.SilkS) (width 0.2))
     (fp_circle (center -1.423 -4.2) (end -1.243 -4.2) (layer F.SilkS) (width 0.25))
     (pad 1 smd rect (at -2.88 -4.5 180) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
-      (net 238 +5V))
+      (net 230 +5V))
     (pad 2 smd rect (at -2.88 -4 180) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad 3 smd rect (at -2.88 -3.5 180) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 4 smd rect (at -2.88 -3 180) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
@@ -6651,21 +7028,21 @@
     (pad 15 smd rect (at -2.88 2.5 180) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
       (net 2 HDMI_D3-))
     (pad 16 smd rect (at -2.88 3 180) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
-      (net 421 HDMI_CEC))
+      (net 413 HDMI_CEC))
     (pad 17 smd rect (at -2.88 3.5 180) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
-      (net 327 HDMI_SCL))
+      (net 319 HDMI_SCL))
     (pad 18 smd rect (at -2.88 4 180) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
-      (net 422 HDMI_SDA))
+      (net 414 HDMI_SDA))
     (pad 19 smd rect (at -2.88 4.5 180) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
-      (net 326 HDMI_HPD))
+      (net 318 HDMI_HPD))
     (pad 20 smd rect (at 2.88 4.5) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
-      (net 290 "Net-(J4-Pad19)"))
+      (net 282 "Net-(J4-Pad19)"))
     (pad 21 smd rect (at 2.88 4) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
-      (net 288 "Net-(J4-Pad16)"))
+      (net 280 "Net-(J4-Pad16)"))
     (pad 22 smd rect (at 2.88 3.5) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
-      (net 291 "Net-(J4-Pad15)"))
+      (net 283 "Net-(J4-Pad15)"))
     (pad 23 smd rect (at 2.88 3) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
-      (net 292 "Net-(J4-Pad13)"))
+      (net 284 "Net-(J4-Pad13)"))
     (pad 24 smd rect (at 2.88 2.5) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
       (net 2 HDMI_D3-))
     (pad 25 smd rect (at 2.88 2) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
@@ -6693,13 +7070,13 @@
     (pad 36 smd rect (at 2.88 -3.5) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 37 smd rect (at 2.88 -4) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
-      (net 245 "Net-(C27-Pad2)"))
+      (net 237 "Net-(C27-Pad2)"))
     (pad 38 smd rect (at 2.88 -4.5) (size 1.56 0.26) (layers F.Cu F.Paste F.Mask)
-      (net 246 "Net-(C30-Pad1)"))
+      (net 238 "Net-(C30-Pad1)"))
   )
 
-  (module footprints:MOLEX_67910-5700 (layer F.Cu) (tedit 5B16DED1) (tstamp 5D065916)
-    (at 104 47.5 180)
+  (module footprints:MOLEX_67910-5700 (layer F.Cu) (tedit 5B16DED1) (tstamp 5D1CCB1F)
+    (at 113 47 180)
     (path /5D06AC46/5D1F1F73)
     (attr smd)
     (fp_text reference U11 (at -12.340457 -6.424727) (layer F.SilkS)
@@ -6728,109 +7105,109 @@
     (fp_line (start 14.4 -5.1) (end 16.8 -5.1) (layer F.SilkS) (width 0.1524))
     (fp_line (start -1 5.1) (end -3.8 5.1) (layer F.SilkS) (width 0.1524))
     (pad 2 smd rect (at -9.6 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 572 "Net-(C52-Pad1)"))
+      (net 564 "Net-(C52-Pad1)"))
     (pad 1 smd rect (at -10 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 390 "Net-(U11-Pad1)"))
+      (net 382 "Net-(U11-Pad1)"))
     (pad 4 smd rect (at -8.8 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 3 smd rect (at -9.2 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 391 "Net-(U11-Pad3)"))
+      (net 383 "Net-(U11-Pad3)"))
     (pad 6 smd rect (at -8 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 392 "Net-(U11-Pad6)"))
+      (net 384 "Net-(U11-Pad6)"))
     (pad 5 smd rect (at -8.4 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 393 "Net-(U11-Pad5)"))
+      (net 385 "Net-(U11-Pad5)"))
     (pad 8 smd rect (at -7.2 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 394 "Net-(U11-Pad8)"))
+      (net 386 "Net-(U11-Pad8)"))
     (pad 7 smd rect (at -7.6 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 395 "Net-(U11-Pad7)"))
+      (net 387 "Net-(U11-Pad7)"))
     (pad 10 smd rect (at -6.4 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 396 "Net-(U11-Pad10)"))
+      (net 388 "Net-(U11-Pad10)"))
     (pad 9 smd rect (at -6.8 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 12 smd rect (at -5.6 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 397 "Net-(U11-Pad12)"))
+      (net 389 "Net-(U11-Pad12)"))
     (pad 11 smd rect (at -6 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 489 PCIE1_CLK_N))
+      (net 481 PCIE1_CLK_N))
     (pad 14 smd rect (at -4.8 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 398 "Net-(U11-Pad14)"))
+      (net 390 "Net-(U11-Pad14)"))
     (pad 13 smd rect (at -5.2 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 490 PCIE1_CLK_P))
+      (net 482 PCIE1_CLK_P))
     (pad 16 smd rect (at -4 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 399 "Net-(U11-Pad16)"))
+      (net 391 "Net-(U11-Pad16)"))
     (pad 15 smd rect (at -4.4 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 18 smd rect (at 0 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 17 smd rect (at -0.4 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 400 "Net-(U11-Pad17)"))
+      (net 392 "Net-(U11-Pad17)"))
     (pad 20 smd rect (at 0.8 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 401 "Net-(U11-Pad20)"))
+      (net 393 "Net-(U11-Pad20)"))
     (pad 19 smd rect (at 0.4 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 402 "Net-(U11-Pad19)"))
+      (net 394 "Net-(U11-Pad19)"))
     (pad 22 smd rect (at 1.6 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 524 PCIE_RESETn))
+      (net 516 PCIE_RESETn))
     (pad 21 smd rect (at 1.2 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 24 smd rect (at 2.4 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 572 "Net-(C52-Pad1)"))
+      (net 564 "Net-(C52-Pad1)"))
     (pad 23 smd rect (at 2 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 498 PCIE1_RX_N))
+      (net 490 PCIE1_RX_N))
     (pad 26 smd rect (at 3.2 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 25 smd rect (at 2.8 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 497 PCIE1_RX_P))
+      (net 489 PCIE1_RX_P))
     (pad 28 smd rect (at 4 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 403 "Net-(U11-Pad28)"))
+      (net 395 "Net-(U11-Pad28)"))
     (pad 27 smd rect (at 3.6 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 30 smd rect (at 4.8 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 404 "Net-(U11-Pad30)"))
+      (net 396 "Net-(U11-Pad30)"))
     (pad 29 smd rect (at 4.4 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 32 smd rect (at 5.6 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 405 "Net-(U11-Pad32)"))
+      (net 397 "Net-(U11-Pad32)"))
     (pad 31 smd rect (at 5.2 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 500 PCIE1_TX_N))
+      (net 492 PCIE1_TX_N))
     (pad 34 smd rect (at 6.4 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 33 smd rect (at 6 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 499 PCIE1_TX_P))
+      (net 491 PCIE1_TX_P))
     (pad 36 smd rect (at 7.2 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 406 "Net-(U11-Pad36)"))
+      (net 398 "Net-(U11-Pad36)"))
     (pad 35 smd rect (at 6.8 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 38 smd rect (at 8 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 407 "Net-(U11-Pad38)"))
+      (net 399 "Net-(U11-Pad38)"))
     (pad 37 smd rect (at 7.6 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 40 smd rect (at 8.8 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 39 smd rect (at 8.4 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 572 "Net-(C52-Pad1)"))
+      (net 564 "Net-(C52-Pad1)"))
     (pad 42 smd rect (at 9.6 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 408 "Net-(U11-Pad42)"))
+      (net 400 "Net-(U11-Pad42)"))
     (pad 41 smd rect (at 9.2 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 572 "Net-(C52-Pad1)"))
+      (net 564 "Net-(C52-Pad1)"))
     (pad 44 smd rect (at 10.4 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 446 "Net-(D22-Pad1)"))
+      (net 438 "Net-(D22-Pad1)"))
     (pad 43 smd rect (at 10 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 46 smd rect (at 11.2 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 409 "Net-(U11-Pad46)"))
+      (net 401 "Net-(U11-Pad46)"))
     (pad 45 smd rect (at 10.8 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 410 "Net-(U11-Pad45)"))
+      (net 402 "Net-(U11-Pad45)"))
     (pad 48 smd rect (at 12 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 411 "Net-(U11-Pad48)"))
+      (net 403 "Net-(U11-Pad48)"))
     (pad 47 smd rect (at 11.6 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 412 "Net-(U11-Pad47)"))
+      (net 404 "Net-(U11-Pad47)"))
     (pad 50 smd rect (at 12.8 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 52 smd rect (at 13.6 -4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 572 "Net-(C52-Pad1)"))
+      (net 564 "Net-(C52-Pad1)"))
     (pad 49 smd rect (at 12.4 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 413 "Net-(U11-Pad49)"))
+      (net 405 "Net-(U11-Pad49)"))
     (pad 51 smd rect (at 13.2 4.1 270) (size 2 0.6) (layers F.Cu F.Paste F.Mask)
-      (net 414 "Net-(U11-Pad51)"))
+      (net 406 "Net-(U11-Pad51)"))
     (pad 53 smd rect (at -12.85 3.5 270) (size 3.2 2.3) (layers F.Cu F.Paste F.Mask))
     (pad 54 smd rect (at 16.45 3.5 270) (size 3.2 2.3) (layers F.Cu F.Paste F.Mask))
     (pad Hole np_thru_hole circle (at 14.3 0 180) (size 1.1 1.1) (drill 1.1) (layers))
@@ -6843,7 +7220,7 @@
   )
 
   (module Package_QFP:HTQFP-64-1EP_10x10mm_P0.5mm_EP8x8mm (layer F.Cu) (tedit 5A65E3DB) (tstamp 5D0658C7)
-    (at 218.5 50 270)
+    (at 83 72.5 90)
     (descr "64-Lead Plastic Thin Quad Flatpack (PT) - 10x10x1 mm Body, 2.00 mm Footprint [HTQFP] thermal pad")
     (tags "HTQFP-64 Pitch 0.5 ")
     (path /5D06A7B6/5D1D2542)
@@ -6875,138 +7252,138 @@
     (fp_text user %R (at 0 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad "" smd rect (at -2 2 90) (size 3.2 3.2) (layers F.Paste))
-    (pad "" smd rect (at 2 2 90) (size 3.2 3.2) (layers F.Paste))
-    (pad "" smd rect (at 2 -2 90) (size 3.2 3.2) (layers F.Paste))
-    (pad "" smd rect (at -2 -2 90) (size 3.2 3.2) (layers F.Paste))
-    (pad 65 smd rect (at 0 0 90) (size 8 8) (layers F.Cu F.Mask)
-      (net 40 GND))
-    (pad 64 smd rect (at -3.75 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 63 smd rect (at -3.25 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 487 +1V8))
-    (pad 62 smd rect (at -2.75 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 427 +1V2))
-    (pad 61 smd rect (at -2.25 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 522 EDP_IRQ))
-    (pad 60 smd rect (at -1.75 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 369 "Net-(U10-Pad60)"))
-    (pad 59 smd rect (at -1.25 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 427 +1V2))
-    (pad 58 smd rect (at -0.75 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 370 "Net-(U10-Pad58)"))
-    (pad 57 smd rect (at -0.25 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 371 "Net-(U10-Pad57)"))
-    (pad 56 smd rect (at 0.25 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 372 "Net-(U10-Pad56)"))
-    (pad 55 smd rect (at 0.75 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 373 "Net-(U10-Pad55)"))
-    (pad 54 smd rect (at 1.25 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 374 "Net-(U10-Pad54)"))
-    (pad 53 smd rect (at 1.75 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 487 +1V8))
-    (pad 52 smd rect (at 2.25 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 51 smd rect (at 2.75 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 597 "Net-(R77-Pad2)"))
-    (pad 50 smd rect (at 3.25 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 375 "Net-(U10-Pad50)"))
-    (pad 49 smd rect (at 3.75 -5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 427 +1V2))
-    (pad 48 smd rect (at 5.7 -3.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 427 +1V2))
-    (pad 47 smd rect (at 5.7 -3.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 376 "Net-(U10-Pad47)"))
-    (pad 46 smd rect (at 5.7 -2.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 377 "Net-(U10-Pad46)"))
-    (pad 45 smd rect (at 5.7 -2.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 378 "Net-(U10-Pad45)"))
-    (pad 44 smd rect (at 5.7 -1.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 379 "Net-(U10-Pad44)"))
-    (pad 43 smd rect (at 5.7 -1.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 427 +1V2))
-    (pad 42 smd rect (at 5.7 -0.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 487 +1V8))
-    (pad 41 smd rect (at 5.7 -0.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 427 +1V2))
-    (pad 40 smd rect (at 5.7 0.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 285 EDP_TX1_DN))
-    (pad 39 smd rect (at 5.7 0.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 286 EDP_TX1_DP))
-    (pad 38 smd rect (at 5.7 1.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 283 EDP_TX0_DN))
-    (pad 37 smd rect (at 5.7 1.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 284 EDP_TX0_DP))
-    (pad 36 smd rect (at 5.7 2.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 427 +1V2))
-    (pad 35 smd rect (at 5.7 2.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 281 EDP_AUX_DN))
-    (pad 34 smd rect (at 5.7 3.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 282 EDP_AUX_DP))
-    (pad 33 smd rect (at 5.7 3.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 427 +1V2))
-    (pad 32 smd rect (at 3.75 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 485 "Net-(R64-Pad2)"))
-    (pad 31 smd rect (at 3.25 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 427 +1V2))
-    (pad 30 smd rect (at 2.75 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 329 DSI_D3_N))
-    (pad 29 smd rect (at 2.25 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 330 DSI_D3_P))
-    (pad 28 smd rect (at 1.75 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 337 DSI_D2_N))
-    (pad 27 smd rect (at 1.25 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 338 DSI_D2_P))
-    (pad 26 smd rect (at 0.75 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 25 smd rect (at 0.25 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 333 DSI_CLK_N))
-    (pad 24 smd rect (at -0.25 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 334 DSI_CLK_P))
-    (pad 23 smd rect (at -0.75 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 22 smd rect (at -1.25 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 335 DSI_D1_N))
-    (pad 21 smd rect (at -1.75 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 336 DSI_D1_P))
-    (pad 20 smd rect (at -2.25 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 331 DSI_D0_N))
-    (pad 19 smd rect (at -2.75 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 332 DSI_D0_P))
-    (pad 18 smd rect (at -3.25 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 427 +1V2))
-    (pad 17 smd rect (at -3.75 5.7) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 427 +1V2))
-    (pad 16 smd rect (at -5.7 3.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 488 EDP_SDA))
-    (pad 15 smd rect (at -5.7 3.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 486 EDP_SCL))
-    (pad 14 smd rect (at -5.7 2.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask))
-    (pad 13 smd rect (at -5.7 2.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 380 "Net-(U10-Pad13)"))
-    (pad 12 smd rect (at -5.7 1.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 381 "Net-(U10-Pad12)"))
-    (pad 11 smd rect (at -5.7 1.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 382 "Net-(U10-Pad11)"))
-    (pad 10 smd rect (at -5.7 0.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 383 "Net-(U10-Pad10)"))
-    (pad 9 smd rect (at -5.7 0.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 384 "Net-(U10-Pad9)"))
-    (pad 8 smd rect (at -5.7 -0.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 385 "Net-(U10-Pad8)"))
-    (pad 7 smd rect (at -5.7 -0.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 386 "Net-(U10-Pad7)"))
-    (pad 6 smd rect (at -5.7 -1.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 387 "Net-(U10-Pad6)"))
-    (pad 5 smd rect (at -5.7 -1.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 388 "Net-(U10-Pad5)"))
-    (pad 4 smd rect (at -5.7 -2.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 389 "Net-(U10-Pad4)"))
-    (pad 3 smd rect (at -5.7 -2.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 427 +1V2))
-    (pad 2 smd rect (at -5.7 -3.25 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
-      (net 523 EDP_RESETn))
-    (pad 1 smd rect (at -5.7 -3.75 270) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+    (pad "" smd rect (at -2 2 270) (size 3.2 3.2) (layers F.Paste))
+    (pad "" smd rect (at 2 2 270) (size 3.2 3.2) (layers F.Paste))
+    (pad "" smd rect (at 2 -2 270) (size 3.2 3.2) (layers F.Paste))
+    (pad "" smd rect (at -2 -2 270) (size 3.2 3.2) (layers F.Paste))
+    (pad 65 smd rect (at 0 0 270) (size 8 8) (layers F.Cu F.Mask)
+      (net 40 GND))
+    (pad 64 smd rect (at -3.75 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 63 smd rect (at -3.25 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 479 +1V8))
+    (pad 62 smd rect (at -2.75 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 419 +1V2))
+    (pad 61 smd rect (at -2.25 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 514 EDP_IRQ))
+    (pad 60 smd rect (at -1.75 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 361 "Net-(U10-Pad60)"))
+    (pad 59 smd rect (at -1.25 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 419 +1V2))
+    (pad 58 smd rect (at -0.75 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 362 "Net-(U10-Pad58)"))
+    (pad 57 smd rect (at -0.25 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 363 "Net-(U10-Pad57)"))
+    (pad 56 smd rect (at 0.25 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 364 "Net-(U10-Pad56)"))
+    (pad 55 smd rect (at 0.75 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 365 "Net-(U10-Pad55)"))
+    (pad 54 smd rect (at 1.25 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 366 "Net-(U10-Pad54)"))
+    (pad 53 smd rect (at 1.75 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 479 +1V8))
+    (pad 52 smd rect (at 2.25 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 51 smd rect (at 2.75 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 589 "Net-(R77-Pad2)"))
+    (pad 50 smd rect (at 3.25 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 367 "Net-(U10-Pad50)"))
+    (pad 49 smd rect (at 3.75 -5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 419 +1V2))
+    (pad 48 smd rect (at 5.7 -3.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 419 +1V2))
+    (pad 47 smd rect (at 5.7 -3.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 368 "Net-(U10-Pad47)"))
+    (pad 46 smd rect (at 5.7 -2.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 369 "Net-(U10-Pad46)"))
+    (pad 45 smd rect (at 5.7 -2.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 370 "Net-(U10-Pad45)"))
+    (pad 44 smd rect (at 5.7 -1.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 371 "Net-(U10-Pad44)"))
+    (pad 43 smd rect (at 5.7 -1.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 419 +1V2))
+    (pad 42 smd rect (at 5.7 -0.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 479 +1V8))
+    (pad 41 smd rect (at 5.7 -0.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 419 +1V2))
+    (pad 40 smd rect (at 5.7 0.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 277 EDP_TX1_DN))
+    (pad 39 smd rect (at 5.7 0.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 278 EDP_TX1_DP))
+    (pad 38 smd rect (at 5.7 1.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 275 EDP_TX0_DN))
+    (pad 37 smd rect (at 5.7 1.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 276 EDP_TX0_DP))
+    (pad 36 smd rect (at 5.7 2.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 419 +1V2))
+    (pad 35 smd rect (at 5.7 2.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 273 EDP_AUX_DN))
+    (pad 34 smd rect (at 5.7 3.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 274 EDP_AUX_DP))
+    (pad 33 smd rect (at 5.7 3.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 419 +1V2))
+    (pad 32 smd rect (at 3.75 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 477 "Net-(R64-Pad2)"))
+    (pad 31 smd rect (at 3.25 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 419 +1V2))
+    (pad 30 smd rect (at 2.75 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 321 DSI_D3_N))
+    (pad 29 smd rect (at 2.25 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 322 DSI_D3_P))
+    (pad 28 smd rect (at 1.75 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 329 DSI_D2_N))
+    (pad 27 smd rect (at 1.25 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 330 DSI_D2_P))
+    (pad 26 smd rect (at 0.75 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 25 smd rect (at 0.25 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 325 DSI_CLK_N))
+    (pad 24 smd rect (at -0.25 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 326 DSI_CLK_P))
+    (pad 23 smd rect (at -0.75 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 40 GND))
+    (pad 22 smd rect (at -1.25 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 327 DSI_D1_N))
+    (pad 21 smd rect (at -1.75 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 328 DSI_D1_P))
+    (pad 20 smd rect (at -2.25 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 323 DSI_D0_N))
+    (pad 19 smd rect (at -2.75 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 324 DSI_D0_P))
+    (pad 18 smd rect (at -3.25 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 419 +1V2))
+    (pad 17 smd rect (at -3.75 5.7 180) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 419 +1V2))
+    (pad 16 smd rect (at -5.7 3.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 480 EDP_SDA))
+    (pad 15 smd rect (at -5.7 3.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 478 EDP_SCL))
+    (pad 14 smd rect (at -5.7 2.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask))
+    (pad 13 smd rect (at -5.7 2.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 372 "Net-(U10-Pad13)"))
+    (pad 12 smd rect (at -5.7 1.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 373 "Net-(U10-Pad12)"))
+    (pad 11 smd rect (at -5.7 1.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 374 "Net-(U10-Pad11)"))
+    (pad 10 smd rect (at -5.7 0.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 375 "Net-(U10-Pad10)"))
+    (pad 9 smd rect (at -5.7 0.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 376 "Net-(U10-Pad9)"))
+    (pad 8 smd rect (at -5.7 -0.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 377 "Net-(U10-Pad8)"))
+    (pad 7 smd rect (at -5.7 -0.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 378 "Net-(U10-Pad7)"))
+    (pad 6 smd rect (at -5.7 -1.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 379 "Net-(U10-Pad6)"))
+    (pad 5 smd rect (at -5.7 -1.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 380 "Net-(U10-Pad5)"))
+    (pad 4 smd rect (at -5.7 -2.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 381 "Net-(U10-Pad4)"))
+    (pad 3 smd rect (at -5.7 -2.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 419 +1V2))
+    (pad 2 smd rect (at -5.7 -3.25 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
+      (net 515 EDP_RESETn))
+    (pad 1 smd rect (at -5.7 -3.75 90) (size 1.5 0.3) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (model ${KISYS3DMOD}/Package_QFP.3dshapes/TQFP-64_10x10mm_Pitch0.5mm_EP8x8mm.wrl
       (at (xyz 0 0 0))
@@ -7016,7 +7393,7 @@
   )
 
   (module Package_DFN_QFN:QFN-64-1EP_9x9mm_P0.5mm_EP6x6mm_ThermalVias (layer F.Cu) (tedit 5B316F24) (tstamp 5D06586B)
-    (at 85.5 117)
+    (at 78 110)
     (descr "QFN, 64 Pin (http://www.ti.com/lit/ds/symlink/tusb8041.pdf), generated with kicad-footprint-generator ipc_dfn_qfn_generator.py")
     (tags "QFN DFN_QFN")
     (path /5D06A2FD/5D114731)
@@ -7047,133 +7424,133 @@
     (fp_line (start 4.61 -4.61) (end 4.61 -4.135) (layer F.SilkS) (width 0.12))
     (fp_line (start 4.135 -4.61) (end 4.61 -4.61) (layer F.SilkS) (width 0.12))
     (pad 64 smd roundrect (at -3.75 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 479 "Net-(R57-Pad1)"))
+      (net 471 "Net-(R57-Pad1)"))
     (pad 63 smd roundrect (at -3.25 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 449 "Net-(FB1-Pad2)"))
+      (net 441 "Net-(FB1-Pad2)"))
     (pad 62 smd roundrect (at -2.75 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 240 "Net-(C21-Pad1)"))
+      (net 232 "Net-(C21-Pad1)"))
     (pad 61 smd roundrect (at -2.25 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 239 "Net-(C20-Pad1)"))
+      (net 231 "Net-(C20-Pad1)"))
     (pad 60 smd roundrect (at -1.75 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 361 "Net-(U9-Pad60)"))
+      (net 353 "Net-(U9-Pad60)"))
     (pad 59 smd roundrect (at -1.25 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 341 USB1_RX_N))
+      (net 333 USB1_RX_N))
     (pad 58 smd roundrect (at -0.75 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 342 USB1_RX_P))
+      (net 334 USB1_RX_P))
     (pad 57 smd roundrect (at -0.25 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 450 "Net-(FB2-Pad2)"))
+      (net 442 "Net-(FB2-Pad2)"))
     (pad 56 smd roundrect (at 0.25 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 439 "Net-(C45-Pad1)"))
+      (net 431 "Net-(C45-Pad1)"))
     (pad 55 smd roundrect (at 0.75 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 438 "Net-(C44-Pad1)"))
+      (net 430 "Net-(C44-Pad1)"))
     (pad 54 smd roundrect (at 1.25 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 345 USB1_DN))
+      (net 337 USB1_DN))
     (pad 53 smd roundrect (at 1.75 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 346 USB1_DP))
+      (net 338 USB1_DP))
     (pad 52 smd roundrect (at 2.25 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 449 "Net-(FB1-Pad2)"))
+      (net 441 "Net-(FB1-Pad2)"))
     (pad 51 smd roundrect (at 2.75 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 450 "Net-(FB2-Pad2)"))
+      (net 442 "Net-(FB2-Pad2)"))
     (pad 50 smd roundrect (at 3.25 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 362 "Net-(U9-Pad50)"))
+      (net 354 "Net-(U9-Pad50)"))
     (pad 49 smd roundrect (at 3.75 -4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 484 "Net-(R63-Pad1)"))
+      (net 476 "Net-(R63-Pad1)"))
     (pad 48 smd roundrect (at 4.4375 -3.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 483 "Net-(R61-Pad1)"))
+      (net 475 "Net-(R61-Pad1)"))
     (pad 47 smd roundrect (at 4.4375 -3.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 363 "Net-(U9-Pad47)"))
+      (net 355 "Net-(U9-Pad47)"))
     (pad 46 smd roundrect (at 4.4375 -2.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 364 "Net-(U9-Pad46)"))
+      (net 356 "Net-(U9-Pad46)"))
     (pad 45 smd roundrect (at 4.4375 -2.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 482 "Net-(R60-Pad1)"))
+      (net 474 "Net-(R60-Pad1)"))
     (pad 44 smd roundrect (at 4.4375 -1.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 365 "Net-(U9-Pad44)"))
+      (net 357 "Net-(U9-Pad44)"))
     (pad 43 smd roundrect (at 4.4375 -1.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 366 "Net-(U9-Pad43)"))
+      (net 358 "Net-(U9-Pad43)"))
     (pad 42 smd roundrect (at 4.4375 -0.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 481 "Net-(R59-Pad1)"))
+      (net 473 "Net-(R59-Pad1)"))
     (pad 41 smd roundrect (at 4.4375 -0.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 367 "Net-(U9-Pad41)"))
+      (net 359 "Net-(U9-Pad41)"))
     (pad 40 smd roundrect (at 4.4375 0.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 480 "Net-(R58-Pad1)"))
+      (net 472 "Net-(R58-Pad1)"))
     (pad 39 smd roundrect (at 4.4375 0.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 368 "Net-(U9-Pad39)"))
+      (net 360 "Net-(U9-Pad39)"))
     (pad 38 smd roundrect (at 4.4375 1.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 605 USBH_SCL))
+      (net 597 USBH_SCL))
     (pad 37 smd roundrect (at 4.4375 1.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 606 USBH_SDA))
+      (net 598 USBH_SDA))
     (pad 36 smd roundrect (at 4.4375 2.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 506 USB3_1_EN))
+      (net 498 USB3_1_EN))
     (pad 35 smd roundrect (at 4.4375 2.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 507 USB3_2_EN))
+      (net 499 USB3_2_EN))
     (pad 34 smd roundrect (at 4.4375 3.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 449 "Net-(FB1-Pad2)"))
+      (net 441 "Net-(FB1-Pad2)"))
     (pad 33 smd roundrect (at 4.4375 3.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 508 USB3_3_EN))
+      (net 500 USB3_3_EN))
     (pad 32 smd roundrect (at 3.75 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 509 USB3_4_EN))
+      (net 501 USB3_4_EN))
     (pad 31 smd roundrect (at 3.25 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 450 "Net-(FB2-Pad2)"))
+      (net 442 "Net-(FB2-Pad2)"))
     (pad 30 smd roundrect (at 2.75 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 510 USB3_4_SSRXN))
+      (net 502 USB3_4_SSRXN))
     (pad 29 smd roundrect (at 2.25 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 511 USB3_4_SSRXP))
+      (net 503 USB3_4_SSRXP))
     (pad 28 smd roundrect (at 1.75 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 450 "Net-(FB2-Pad2)"))
+      (net 442 "Net-(FB2-Pad2)"))
     (pad 27 smd roundrect (at 1.25 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 512 USB3_4_SSTXN))
+      (net 504 USB3_4_SSTXN))
     (pad 26 smd roundrect (at 0.75 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 513 USB3_4_SSTXP))
+      (net 505 USB3_4_SSTXP))
     (pad 25 smd roundrect (at 0.25 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 514 USB3_4_DN))
+      (net 506 USB3_4_DN))
     (pad 24 smd roundrect (at -0.25 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 515 USB3_4_DP))
+      (net 507 USB3_4_DP))
     (pad 23 smd roundrect (at -0.75 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 516 USB3_3_SSRXN))
+      (net 508 USB3_3_SSRXN))
     (pad 22 smd roundrect (at -1.25 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 517 USB3_3_SSRXP))
+      (net 509 USB3_3_SSRXP))
     (pad 21 smd roundrect (at -1.75 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 450 "Net-(FB2-Pad2)"))
+      (net 442 "Net-(FB2-Pad2)"))
     (pad 20 smd roundrect (at -2.25 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 518 USB3_3_SSTXN))
+      (net 510 USB3_3_SSTXN))
     (pad 19 smd roundrect (at -2.75 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 519 USB3_3_SSTXP))
+      (net 511 USB3_3_SSTXP))
     (pad 18 smd roundrect (at -3.25 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 520 USB3_3_DN))
+      (net 512 USB3_3_DN))
     (pad 17 smd roundrect (at -3.75 4.4375) (size 0.25 0.875) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 521 USB3_3_DP))
+      (net 513 USB3_3_DP))
     (pad 16 smd roundrect (at -4.4375 3.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 449 "Net-(FB1-Pad2)"))
+      (net 441 "Net-(FB1-Pad2)"))
     (pad 15 smd roundrect (at -4.4375 3.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 453 USB3_2_SSRXN))
+      (net 445 USB3_2_SSRXN))
     (pad 14 smd roundrect (at -4.4375 2.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 452 USB3_2_SSRXP))
+      (net 444 USB3_2_SSRXP))
     (pad 13 smd roundrect (at -4.4375 2.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 450 "Net-(FB2-Pad2)"))
+      (net 442 "Net-(FB2-Pad2)"))
     (pad 12 smd roundrect (at -4.4375 1.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 430 USB3_2_SSTXN))
+      (net 422 USB3_2_SSTXN))
     (pad 11 smd roundrect (at -4.4375 1.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 434 USB3_2_SSTXP))
+      (net 426 USB3_2_SSTXP))
     (pad 10 smd roundrect (at -4.4375 0.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 455 USB3_2_DN))
+      (net 447 USB3_2_DN))
     (pad 9 smd roundrect (at -4.4375 0.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 454 USB3_2_DP))
+      (net 446 USB3_2_DP))
     (pad 8 smd roundrect (at -4.4375 -0.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 450 "Net-(FB2-Pad2)"))
+      (net 442 "Net-(FB2-Pad2)"))
     (pad 7 smd roundrect (at -4.4375 -0.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 460 USB3_1_SSRXN))
+      (net 452 USB3_1_SSRXN))
     (pad 6 smd roundrect (at -4.4375 -1.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 459 USB3_1_SSRXP))
+      (net 451 USB3_1_SSRXP))
     (pad 5 smd roundrect (at -4.4375 -1.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 450 "Net-(FB2-Pad2)"))
+      (net 442 "Net-(FB2-Pad2)"))
     (pad 4 smd roundrect (at -4.4375 -2.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 432 USB3_1_SSTXN))
+      (net 424 USB3_1_SSTXN))
     (pad 3 smd roundrect (at -4.4375 -2.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 436 USB3_1_SSTXP))
+      (net 428 USB3_1_SSTXP))
     (pad 2 smd roundrect (at -4.4375 -3.25) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 462 USB3_1_DN))
+      (net 454 USB3_1_DN))
     (pad 1 smd roundrect (at -4.4375 -3.75) (size 0.875 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 461 USB3_1_DP))
+      (net 453 USB3_1_DP))
     (pad "" smd roundrect (at 2.0625 2.0625) (size 1.209339 1.209339) (layers F.Paste) (roundrect_rratio 0.206725))
     (pad "" smd roundrect (at 2.0625 0.6875) (size 1.209339 1.209339) (layers F.Paste) (roundrect_rratio 0.206725))
     (pad "" smd roundrect (at 2.0625 -0.6875) (size 1.209339 1.209339) (layers F.Paste) (roundrect_rratio 0.206725))
@@ -7252,7 +7629,7 @@
   )
 
   (module Package_SO:TSSOP-16_4.4x5mm_P0.65mm (layer F.Cu) (tedit 5A02F25C) (tstamp 5D06579F)
-    (at 299 120 180)
+    (at 269 111.5 180)
     (descr "16-Lead Plastic Thin Shrink Small Outline (ST)-4.4 mm Body [TSSOP] (see Microchip Packaging Specification 00000049BS.pdf)")
     (tags "SSOP 0.65")
     (path /5CC81028/5CC9E442)
@@ -7278,37 +7655,37 @@
     (fp_line (start 2.2 -2.5) (end 2.2 2.5) (layer F.Fab) (width 0.15))
     (fp_line (start -1.2 -2.5) (end 2.2 -2.5) (layer F.Fab) (width 0.15))
     (pad 16 smd rect (at 2.95 -2.275 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 306 BATPWR))
+      (net 298 BATPWR))
     (pad 15 smd rect (at 2.95 -1.625 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 306 BATPWR))
+      (net 298 BATPWR))
     (pad 14 smd rect (at 2.95 -0.975 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 306 BATPWR))
+      (net 298 BATPWR))
     (pad 13 smd rect (at 2.95 -0.325 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 359 "Net-(U6-Pad13)"))
+      (net 351 "Net-(U6-Pad13)"))
     (pad 12 smd rect (at 2.95 0.325 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 448 "Net-(F2-Pad2)"))
+      (net 440 "Net-(F2-Pad2)"))
     (pad 11 smd rect (at 2.95 0.975 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 10 smd rect (at 2.95 1.625 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad 9 smd rect (at 2.95 2.275 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 590 CHG_SCL))
+      (net 582 CHG_SCL))
     (pad 8 smd rect (at -2.95 2.275 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 589 CHG_SDA))
+      (net 581 CHG_SDA))
     (pad 7 smd rect (at -2.95 1.625 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 360 "Net-(U6-Pad7)"))
+      (net 352 "Net-(U6-Pad7)"))
     (pad 6 smd rect (at -2.95 0.975 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 5 smd rect (at -2.95 0.325 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 589 CHG_SDA))
+      (net 581 CHG_SDA))
     (pad 4 smd rect (at -2.95 -0.325 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 590 CHG_SCL))
+      (net 582 CHG_SCL))
     (pad 3 smd rect (at -2.95 -0.975 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 448 "Net-(F2-Pad2)"))
+      (net 440 "Net-(F2-Pad2)"))
     (pad 2 smd rect (at -2.95 -1.625 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 448 "Net-(F2-Pad2)"))
+      (net 440 "Net-(F2-Pad2)"))
     (pad 1 smd rect (at -2.95 -2.275 180) (size 1.5 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 448 "Net-(F2-Pad2)"))
+      (net 440 "Net-(F2-Pad2)"))
     (model ${KISYS3DMOD}/Package_SO.3dshapes/TSSOP-16_4.4x5mm_P0.65mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7317,7 +7694,7 @@
   )
 
   (module Package_SO:SSOP-44_5.3x12.8mm_P0.5mm (layer F.Cu) (tedit 5A98D767) (tstamp 5D065769)
-    (at 246 107 90)
+    (at 233 105.5 90)
     (descr "44-Lead Plastic Shrink Small Outline (SS)-5.30 mm Body [SSOP] (http://cds.linear.com/docs/en/datasheet/680313fa.pdf)")
     (tags "SSOP 0.5")
     (path /5CC81028/5CEF5F44)
@@ -7348,13 +7725,13 @@
     (fp_line (start 2.65 -6.4) (end 2.65 6.4) (layer F.Fab) (width 0.1))
     (fp_line (start -1.65 -6.4) (end 2.65 -6.4) (layer F.Fab) (width 0.1))
     (pad 44 smd rect (at 3.375 -5.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 348 BMON_CS))
+      (net 340 BMON_CS))
     (pad 43 smd rect (at 3.375 -4.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 349 BMON_SDO))
+      (net 341 BMON_SDO))
     (pad 42 smd rect (at 3.375 -4.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 350 BMON_SDI))
+      (net 342 BMON_SDI))
     (pad 41 smd rect (at 3.375 -3.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 351 BMON_SCK))
+      (net 343 BMON_SCK))
     (pad 40 smd rect (at 3.375 -3.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 39 smd rect (at 3.375 -2.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
@@ -7364,77 +7741,77 @@
     (pad 37 smd rect (at 3.375 -1.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 36 smd rect (at 3.375 -1.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 316 "Net-(R5-Pad2)"))
+      (net 308 "Net-(R5-Pad2)"))
     (pad 35 smd rect (at 3.375 -0.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 315 "Net-(R4-Pad2)"))
+      (net 307 "Net-(R4-Pad2)"))
     (pad 34 smd rect (at 3.375 -0.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 317 "Net-(R6-Pad2)"))
+      (net 309 "Net-(R6-Pad2)"))
     (pad 33 smd rect (at 3.375 0.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 32 smd rect (at 3.375 0.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 234 "/Reform 2 Power/VREG"))
+      (net 226 "/Reform 2 Power/VREG"))
     (pad 31 smd rect (at 3.375 1.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 233 "Net-(C4-Pad1)"))
+      (net 225 "Net-(C4-Pad1)"))
     (pad 30 smd rect (at 3.375 1.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 352 "Net-(U4-Pad30)"))
+      (net 344 "Net-(U4-Pad30)"))
     (pad 29 smd rect (at 3.375 2.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 353 "Net-(U4-Pad29)"))
+      (net 345 "Net-(U4-Pad29)"))
     (pad 28 smd rect (at 3.375 2.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 503 "Net-(U4-Pad28)"))
+      (net 495 "Net-(U4-Pad28)"))
     (pad 27 smd rect (at 3.375 3.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 26 smd rect (at 3.375 3.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 25 smd rect (at 3.375 4.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 325 "Net-(R24-Pad2)"))
+      (net 317 "Net-(R24-Pad2)"))
     (pad 24 smd rect (at 3.375 4.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 254 "Net-(D10-Pad1)"))
+      (net 246 "Net-(D10-Pad1)"))
     (pad 23 smd rect (at 3.375 5.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 324 "Net-(R23-Pad2)"))
+      (net 316 "Net-(R23-Pad2)"))
     (pad 22 smd rect (at -3.375 5.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 253 "Net-(D8-Pad2)"))
+      (net 245 "Net-(D8-Pad2)"))
     (pad 21 smd rect (at -3.375 4.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 323 "Net-(R22-Pad2)"))
+      (net 315 "Net-(R22-Pad2)"))
     (pad 20 smd rect (at -3.375 4.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 252 "Net-(D7-Pad2)"))
+      (net 244 "Net-(D7-Pad2)"))
     (pad 19 smd rect (at -3.375 3.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 322 "Net-(R21-Pad2)"))
+      (net 314 "Net-(R21-Pad2)"))
     (pad 18 smd rect (at -3.375 3.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 251 "Net-(D6-Pad2)"))
+      (net 243 "Net-(D6-Pad2)"))
     (pad 17 smd rect (at -3.375 2.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 321 "Net-(R20-Pad2)"))
+      (net 313 "Net-(R20-Pad2)"))
     (pad 16 smd rect (at -3.375 2.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 250 "Net-(D5-Pad2)"))
+      (net 242 "Net-(D5-Pad2)"))
     (pad 15 smd rect (at -3.375 1.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 320 "Net-(R19-Pad2)"))
+      (net 312 "Net-(R19-Pad2)"))
     (pad 14 smd rect (at -3.375 1.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 249 "Net-(D4-Pad2)"))
+      (net 241 "Net-(D4-Pad2)"))
     (pad 13 smd rect (at -3.375 0.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 319 "Net-(R18-Pad2)"))
+      (net 311 "Net-(R18-Pad2)"))
     (pad 12 smd rect (at -3.375 0.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 248 "Net-(D3-Pad2)"))
+      (net 240 "Net-(D3-Pad2)"))
     (pad 11 smd rect (at -3.375 -0.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 318 "Net-(R17-Pad2)"))
+      (net 310 "Net-(R17-Pad2)"))
     (pad 10 smd rect (at -3.375 -0.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 440 "Net-(D3-Pad1)"))
+      (net 432 "Net-(D3-Pad1)"))
     (pad 9 smd rect (at -3.375 -1.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 354 "Net-(U4-Pad9)"))
+      (net 346 "Net-(U4-Pad9)"))
     (pad 8 smd rect (at -3.375 -1.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 477 "Net-(R52-Pad1)"))
+      (net 469 "Net-(R52-Pad1)"))
     (pad 7 smd rect (at -3.375 -2.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 355 "Net-(U4-Pad7)"))
+      (net 347 "Net-(U4-Pad7)"))
     (pad 6 smd rect (at -3.375 -2.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 477 "Net-(R52-Pad1)"))
+      (net 469 "Net-(R52-Pad1)"))
     (pad 5 smd rect (at -3.375 -3.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 356 "Net-(U4-Pad5)"))
+      (net 348 "Net-(U4-Pad5)"))
     (pad 4 smd rect (at -3.375 -3.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 477 "Net-(R52-Pad1)"))
+      (net 469 "Net-(R52-Pad1)"))
     (pad 3 smd rect (at -3.375 -4.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 357 "Net-(U4-Pad3)"))
+      (net 349 "Net-(U4-Pad3)"))
     (pad 2 smd rect (at -3.375 -4.75 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 477 "Net-(R52-Pad1)"))
+      (net 469 "Net-(R52-Pad1)"))
     (pad 1 smd rect (at -3.375 -5.25 90) (size 1.25 0.25) (layers F.Cu F.Paste F.Mask)
-      (net 232 "Net-(C2-Pad1)"))
+      (net 224 "Net-(C2-Pad1)"))
     (model ${KISYS3DMOD}/Package_SO.3dshapes/SSOP-44_5.3x12.8mm_P0.5mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7443,7 +7820,7 @@
   )
 
   (module Package_DFN_QFN:QFN-28-1EP_4x5mm_P0.5mm_EP2.65x3.65mm (layer F.Cu) (tedit 5C1FD453) (tstamp 5D065712)
-    (at 282 120)
+    (at 256.5 110)
     (descr "QFN, 28 Pin (http://www.analog.com/media/en/technical-documentation/data-sheets/3555fe.pdf#page=32), generated with kicad-footprint-generator ipc_dfn_qfn_generator.py")
     (tags "QFN DFN_QFN")
     (path /5CC81028/5D769B56)
@@ -7474,61 +7851,61 @@
     (fp_line (start 2.11 -2.61) (end 2.11 -2.135) (layer F.SilkS) (width 0.12))
     (fp_line (start 1.635 -2.61) (end 2.11 -2.61) (layer F.SilkS) (width 0.12))
     (pad 28 smd roundrect (at -1.25 -2.45) (size 0.25 0.85) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 426 "Net-(C34-Pad1)"))
+      (net 418 "Net-(C34-Pad1)"))
     (pad 27 smd roundrect (at -0.75 -2.45) (size 0.25 0.85) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 426 "Net-(C34-Pad1)"))
+      (net 418 "Net-(C34-Pad1)"))
     (pad 26 smd roundrect (at -0.25 -2.45) (size 0.25 0.85) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 230 "Net-(C1-Pad2)"))
+      (net 222 "Net-(C1-Pad2)"))
     (pad 25 smd roundrect (at 0.25 -2.45) (size 0.25 0.85) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 230 "Net-(C1-Pad2)"))
+      (net 222 "Net-(C1-Pad2)"))
     (pad 24 smd roundrect (at 0.75 -2.45) (size 0.25 0.85) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 23 smd roundrect (at 1.25 -2.45) (size 0.25 0.85) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 22 smd roundrect (at 1.95 -1.75) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 472 "Net-(Q2-Pad4)"))
+      (net 464 "Net-(Q2-Pad4)"))
     (pad 21 smd roundrect (at 1.95 -1.25) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 293 "Net-(L1-Pad2)"))
+      (net 285 "Net-(L1-Pad2)"))
     (pad 20 smd roundrect (at 1.95 -0.75) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 306 BATPWR))
+      (net 298 BATPWR))
     (pad 19 smd roundrect (at 1.95 -0.25) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 306 BATPWR))
+      (net 298 BATPWR))
     (pad 18 smd roundrect (at 1.95 0.25) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 17 smd roundrect (at 1.95 0.75) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 424 "Net-(C32-Pad1)"))
+      (net 416 "Net-(C32-Pad1)"))
     (pad 16 smd roundrect (at 1.95 1.25) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 15 smd roundrect (at 1.95 1.75) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 14 smd roundrect (at 1.25 2.45) (size 0.25 0.85) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 589 CHG_SDA))
+      (net 581 CHG_SDA))
     (pad 13 smd roundrect (at 0.75 2.45) (size 0.25 0.85) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 590 CHG_SCL))
+      (net 582 CHG_SCL))
     (pad 12 smd roundrect (at 0.25 2.45) (size 0.25 0.85) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 11 smd roundrect (at -0.25 2.45) (size 0.25 0.85) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 475 "Net-(R49-Pad1)"))
+      (net 467 "Net-(R49-Pad1)"))
     (pad 10 smd roundrect (at -0.75 2.45) (size 0.25 0.85) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 474 "Net-(R3-Pad1)"))
+      (net 466 "Net-(R3-Pad1)"))
     (pad 9 smd roundrect (at -1.25 2.45) (size 0.25 0.85) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 473 "Net-(R3-Pad2)"))
+      (net 465 "Net-(R3-Pad2)"))
     (pad 8 smd roundrect (at -1.95 1.75) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 424 "Net-(C32-Pad1)"))
+      (net 416 "Net-(C32-Pad1)"))
     (pad 7 smd roundrect (at -1.95 1.25) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 423 +36V))
+      (net 415 +36V))
     (pad 6 smd roundrect (at -1.95 0.75) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 471 "Net-(Q1-Pad4)"))
+      (net 463 "Net-(Q1-Pad4)"))
     (pad 5 smd roundrect (at -1.95 0.25) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 470 "Net-(Q1-Pad5)"))
+      (net 462 "Net-(Q1-Pad5)"))
     (pad 4 smd roundrect (at -1.95 -0.25) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 426 "Net-(C34-Pad1)"))
+      (net 418 "Net-(C34-Pad1)"))
     (pad 3 smd roundrect (at -1.95 -0.75) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 426 "Net-(C34-Pad1)"))
+      (net 418 "Net-(C34-Pad1)"))
     (pad 2 smd roundrect (at -1.95 -1.25) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 425 "Net-(C33-Pad1)"))
+      (net 417 "Net-(C33-Pad1)"))
     (pad 1 smd roundrect (at -1.95 -1.75) (size 0.85 0.25) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 231 "Net-(C1-Pad1)"))
+      (net 223 "Net-(C1-Pad1)"))
     (pad "" smd roundrect (at 0.66 1.22) (size 1.07 0.98) (layers F.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at 0.66 0) (size 1.07 0.98) (layers F.Paste) (roundrect_rratio 0.25))
     (pad "" smd roundrect (at 0.66 -1.22) (size 1.07 0.98) (layers F.Paste) (roundrect_rratio 0.25))
@@ -7545,7 +7922,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063CEC)
-    (at 66.75 46.75)
+    (at 64.75 59.25)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D0D8363/5D185434)
@@ -7570,9 +7947,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 328 HDMI_I2C))
+      (net 320 HDMI_I2C))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7581,7 +7958,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063CDB)
-    (at 66.75 49.25)
+    (at 64.75 61.75)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D0D8363/5D1829B9)
@@ -7606,9 +7983,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 327 HDMI_SCL))
+      (net 319 HDMI_SCL))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7617,7 +7994,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063CCA)
-    (at 63.75 42.25 90)
+    (at 63.75 48.25 90)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D0D8363/5D16CD31)
@@ -7642,9 +8019,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 326 HDMI_HPD))
+      (net 318 HDMI_HPD))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7653,7 +8030,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063CB9)
-    (at 55.25 42.25 270)
+    (at 55.25 48.25 270)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D0D8363/5D13F480)
@@ -7680,7 +8057,7 @@
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 290 "Net-(J4-Pad19)"))
+      (net 282 "Net-(J4-Pad19)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7689,7 +8066,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063CA8)
-    (at 57.25 42.25 270)
+    (at 57.25 48.25 270)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D0D8363/5D14D233)
@@ -7714,9 +8091,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 288 "Net-(J4-Pad16)"))
+      (net 280 "Net-(J4-Pad16)"))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 238 +5V))
+      (net 230 +5V))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7725,7 +8102,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063C97)
-    (at 53.25 42.25 270)
+    (at 53.25 48.25 270)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D0D8363/5D14CD66)
@@ -7750,9 +8127,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 291 "Net-(J4-Pad15)"))
+      (net 283 "Net-(J4-Pad15)"))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 238 +5V))
+      (net 230 +5V))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7761,7 +8138,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063C86)
-    (at 75.5 75 90)
+    (at 152.5 79.5 90)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D0CA3EB/5D1CB92A)
@@ -7788,7 +8165,7 @@
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 218 SD2_CD))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7797,7 +8174,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063C75)
-    (at 85.5 106 180)
+    (at 78 99 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5D06A2FD/5D1A9B0D)
@@ -7822,9 +8199,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 240 "Net-(C21-Pad1)"))
+      (net 232 "Net-(C21-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 239 "Net-(C20-Pad1)"))
+      (net 231 "Net-(C20-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7832,8 +8209,8 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063C64)
-    (at 40.5 139 270)
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D1DD917)
+    (at 66 128.5 270)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D1C4735)
@@ -7858,7 +8235,7 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 270 "Net-(D18-Pad1)"))
+      (net 262 "Net-(D18-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
@@ -7869,7 +8246,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063C53)
-    (at 61 138.5 270)
+    (at 77 129 270)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D06E8D8)
@@ -7894,9 +8271,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 268 "Net-(D17-Pad1)"))
+      (net 260 "Net-(D17-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 229 "Net-(BT7-Pad2)"))
+      (net 681 BAT8+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7905,7 +8282,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063C42)
-    (at 84 138.5 270)
+    (at 104 128.5 270)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0A6A3E)
@@ -7930,9 +8307,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 266 "Net-(D16-Pad1)"))
+      (net 258 "Net-(D16-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 228 "Net-(BT6-Pad2)"))
+      (net 680 BAT7+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7941,7 +8318,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063C31)
-    (at 107.5 138 270)
+    (at 114.5 128.5 270)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0B06AF)
@@ -7966,9 +8343,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 264 "Net-(D15-Pad1)"))
+      (net 256 "Net-(D15-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 227 "Net-(BT5-Pad2)"))
+      (net 679 BAT6+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7976,8 +8353,8 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063C20)
-    (at 231.5 139.5 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D1D0806)
+    (at 231 129.5 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0B8574)
@@ -8002,9 +8379,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 262 "Net-(D14-Pad1)"))
+      (net 254 "Net-(D14-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 226 "Net-(BT4-Pad2)"))
+      (net 678 BAT5+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8013,7 +8390,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063C0F)
-    (at 247 138.5 270)
+    (at 238 129 270)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0C30BB)
@@ -8038,9 +8415,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 260 "Net-(D13-Pad1)"))
+      (net 252 "Net-(D13-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 225 "Net-(BT3-Pad2)"))
+      (net 677 BAT4+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8049,7 +8426,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063BFE)
-    (at 269.5 139 270)
+    (at 263.5 129 270)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0F86C0)
@@ -8074,9 +8451,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 258 "Net-(D12-Pad1)"))
+      (net 250 "Net-(D12-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 224 "Net-(BT2-Pad2)"))
+      (net 676 BAT3+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8085,18 +8462,18 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063BED)
-    (at 293 138.5 270)
+    (at 274 124.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D090CAD)
     (attr smd)
-    (fp_text reference R33 (at 0 1.5 90) (layer F.SilkS)
+    (fp_text reference R33 (at 0 -1.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 475 (at 0 1.43 90) (layer F.Fab)
+    (fp_text value 475 (at 0 1.43) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
+    (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.4 0.4) (thickness 0.06)))
     )
     (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
@@ -8109,10 +8486,10 @@
     (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 256 "Net-(D11-Pad1)"))
-    (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 222 "Net-(BT1-Pad2)"))
+    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 248 "Net-(D11-Pad1)"))
+    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 675 BAT2+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8120,8 +8497,8 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063BDC)
-    (at 41.5 134)
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D1DDA64)
+    (at 67 123.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D1C471A)
@@ -8146,7 +8523,7 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 269 "Net-(D18-Pad2)"))
+      (net 261 "Net-(D18-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
@@ -8157,7 +8534,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063BCB)
-    (at 60.5 136)
+    (at 76.5 126.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D03E837)
@@ -8182,9 +8559,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 267 "Net-(D17-Pad2)"))
+      (net 259 "Net-(D17-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 229 "Net-(BT7-Pad2)"))
+      (net 681 BAT8+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8193,7 +8570,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063BBA)
-    (at 83.5 136)
+    (at 103.5 126)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0A6A25)
@@ -8218,9 +8595,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 265 "Net-(D16-Pad2)"))
+      (net 257 "Net-(D16-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 228 "Net-(BT6-Pad2)"))
+      (net 680 BAT7+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8229,7 +8606,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063BA9)
-    (at 107 135)
+    (at 114 125.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0B0696)
@@ -8254,9 +8631,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 263 "Net-(D15-Pad2)"))
+      (net 255 "Net-(D15-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 227 "Net-(BT5-Pad2)"))
+      (net 679 BAT6+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8264,8 +8641,8 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063B98)
-    (at 227.5 135.5 90)
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D1D071F)
+    (at 227 125.5 90)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0B855B)
@@ -8290,9 +8667,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 261 "Net-(D14-Pad2)"))
+      (net 253 "Net-(D14-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 226 "Net-(BT4-Pad2)"))
+      (net 678 BAT5+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8301,7 +8678,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063B87)
-    (at 246.5 136)
+    (at 237.5 126.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0C30A2)
@@ -8326,9 +8703,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 259 "Net-(D13-Pad2)"))
+      (net 251 "Net-(D13-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 225 "Net-(BT3-Pad2)"))
+      (net 677 BAT4+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8337,7 +8714,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063B76)
-    (at 269 136.5)
+    (at 263 126.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0F86A7)
@@ -8362,9 +8739,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 257 "Net-(D12-Pad2)"))
+      (net 249 "Net-(D12-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 224 "Net-(BT2-Pad2)"))
+      (net 676 BAT3+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8373,7 +8750,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063B65)
-    (at 292.5 136)
+    (at 274 122.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D090C92)
@@ -8398,9 +8775,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 255 "Net-(D11-Pad2)"))
+      (net 247 "Net-(D11-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 222 "Net-(BT1-Pad2)"))
+      (net 675 BAT2+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8409,7 +8786,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063B54)
-    (at 55.5 134.5)
+    (at 76.5 124)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D1C4701)
@@ -8434,9 +8811,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 325 "Net-(R24-Pad2)"))
+      (net 317 "Net-(R24-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 314 "Net-(Q12-Pad1)"))
+      (net 306 "Net-(Q12-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8445,7 +8822,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063B43)
-    (at 64 132.5)
+    (at 80 122.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0386BB)
@@ -8470,9 +8847,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 324 "Net-(R23-Pad2)"))
+      (net 316 "Net-(R23-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 313 "Net-(Q11-Pad1)"))
+      (net 305 "Net-(Q11-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8481,7 +8858,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063B32)
-    (at 87 132.5)
+    (at 107 122.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0A6A0D)
@@ -8506,9 +8883,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 323 "Net-(R22-Pad2)"))
+      (net 315 "Net-(R22-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 312 "Net-(Q10-Pad1)"))
+      (net 304 "Net-(Q10-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8517,7 +8894,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063B21)
-    (at 110.5 132)
+    (at 117.5 122.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0B067E)
@@ -8542,9 +8919,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 322 "Net-(R21-Pad2)"))
+      (net 314 "Net-(R21-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 311 "Net-(Q9-Pad1)"))
+      (net 303 "Net-(Q9-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8552,8 +8929,8 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063B10)
-    (at 229.5 133 180)
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D1D0689)
+    (at 229 123 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0B8543)
@@ -8578,9 +8955,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 321 "Net-(R20-Pad2)"))
+      (net 313 "Net-(R20-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 310 "Net-(Q8-Pad1)"))
+      (net 302 "Net-(Q8-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8589,7 +8966,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063AFF)
-    (at 248 132.5 180)
+    (at 239 123 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0C308A)
@@ -8614,9 +8991,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 320 "Net-(R19-Pad2)"))
+      (net 312 "Net-(R19-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 309 "Net-(Q7-Pad1)"))
+      (net 301 "Net-(Q7-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8625,7 +9002,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063AEE)
-    (at 270.5 133 180)
+    (at 263 123.5 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0F868F)
@@ -8650,9 +9027,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 319 "Net-(R18-Pad2)"))
+      (net 311 "Net-(R18-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 308 "Net-(Q6-Pad1)"))
+      (net 300 "Net-(Q6-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8661,12 +9038,12 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063ADD)
-    (at 294 133 180)
+    (at 279 127.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D090C79)
     (attr smd)
-    (fp_text reference R17 (at 0 1.5) (layer F.SilkS)
+    (fp_text reference R17 (at 0 -1.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 3.3k (at 0 1.43) (layer F.Fab)
@@ -8685,10 +9062,10 @@
     (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 318 "Net-(R17-Pad2)"))
-    (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 307 "Net-(Q5-Pad1)"))
+    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 310 "Net-(R17-Pad2)"))
+    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 299 "Net-(Q5-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8696,8 +9073,8 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063ACC)
-    (at 50.5 135)
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D1DD9BC)
+    (at 73 127.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D1C470D)
@@ -8722,9 +9099,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 254 "Net-(D10-Pad1)"))
+      (net 246 "Net-(D10-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 229 "Net-(BT7-Pad2)"))
+      (net 681 BAT8+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8733,7 +9110,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063ABB)
-    (at 73.5 134.5)
+    (at 83.5 125.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D03B638)
@@ -8758,9 +9135,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 253 "Net-(D8-Pad2)"))
+      (net 245 "Net-(D8-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 228 "Net-(BT6-Pad2)"))
+      (net 680 BAT7+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8769,7 +9146,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063AAA)
-    (at 96.7875 134.5)
+    (at 110.5 126)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0A6A18)
@@ -8794,9 +9171,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 252 "Net-(D7-Pad2)"))
+      (net 244 "Net-(D7-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 227 "Net-(BT5-Pad2)"))
+      (net 679 BAT6+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8805,7 +9182,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063A99)
-    (at 119.5 134.5)
+    (at 121 125.5)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0B0689)
@@ -8830,9 +9207,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 251 "Net-(D6-Pad2)"))
+      (net 243 "Net-(D6-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 226 "Net-(BT4-Pad2)"))
+      (net 678 BAT5+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8840,13 +9217,13 @@
     )
   )
 
-  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063A88)
-    (at 237.5 133)
+  (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D1D06EF)
+    (at 234 125)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0B854E)
     (attr smd)
-    (fp_text reference R12 (at 0 1.5) (layer F.SilkS)
+    (fp_text reference R12 (at 0 -1.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 100 (at 0 1.43) (layer F.Fab)
@@ -8866,9 +9243,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 250 "Net-(D5-Pad2)"))
+      (net 242 "Net-(D5-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 225 "Net-(BT3-Pad2)"))
+      (net 677 BAT4+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8877,12 +9254,12 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063A77)
-    (at 259 133 180)
+    (at 245 124.5 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0C3095)
     (attr smd)
-    (fp_text reference R11 (at 0 -1.43) (layer F.SilkS)
+    (fp_text reference R11 (at 0 1.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 100 (at 0 1.43) (layer F.Fab)
@@ -8902,9 +9279,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 249 "Net-(D4-Pad2)"))
+      (net 241 "Net-(D4-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 224 "Net-(BT2-Pad2)"))
+      (net 676 BAT3+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8913,12 +9290,12 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063A66)
-    (at 281.5 133 180)
+    (at 270.5 122 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D0F869A)
     (attr smd)
-    (fp_text reference R10 (at 0 -1.43) (layer F.SilkS)
+    (fp_text reference R10 (at 0 1.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 100 (at 0 1.43) (layer F.Fab)
@@ -8938,9 +9315,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 248 "Net-(D3-Pad2)"))
+      (net 240 "Net-(D3-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 222 "Net-(BT1-Pad2)"))
+      (net 675 BAT2+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8949,12 +9326,12 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063A55)
-    (at 298 133)
+    (at 272 127.5 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D090C85)
     (attr smd)
-    (fp_text reference R9 (at 0 -1.43) (layer F.SilkS)
+    (fp_text reference R9 (at 0 1.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 100 (at 0 1.43) (layer F.Fab)
@@ -8973,10 +9350,10 @@
     (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 440 "Net-(D3-Pad1)"))
-    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 223 "Net-(BT1-Pad1)"))
+    (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 432 "Net-(D3-Pad1)"))
+    (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 674 BAT1+))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8985,7 +9362,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063A44)
-    (at 270 77.5 270)
+    (at 269.5 48.5 270)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D80896E)
@@ -9010,9 +9387,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 235 "Net-(C6-Pad1)"))
+      (net 227 "Net-(C6-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 306 BATPWR))
+      (net 298 BATPWR))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9021,7 +9398,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063A33)
-    (at 238.5 113.5 90)
+    (at 225.5 112 90)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D3CD30B)
@@ -9046,9 +9423,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 232 "Net-(C2-Pad1)"))
+      (net 224 "Net-(C2-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 247 "Net-(D1-Pad1)"))
+      (net 239 "Net-(D1-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9057,7 +9434,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063A22)
-    (at 242 100.5)
+    (at 229 99)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D5C2DFF)
@@ -9082,9 +9459,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 317 "Net-(R6-Pad2)"))
+      (net 309 "Net-(R6-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 234 "/Reform 2 Power/VREG"))
+      (net 226 "/Reform 2 Power/VREG"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9093,7 +9470,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063A11)
-    (at 245.5 97.5 180)
+    (at 232.5 96 180)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D4F04F9)
@@ -9118,9 +9495,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 316 "Net-(R5-Pad2)"))
+      (net 308 "Net-(R5-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 234 "/Reform 2 Power/VREG"))
+      (net 226 "/Reform 2 Power/VREG"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9129,7 +9506,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D063A00)
-    (at 242 97.5)
+    (at 229 96)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D4EFF9C)
@@ -9154,9 +9531,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 315 "Net-(R4-Pad2)"))
+      (net 307 "Net-(R4-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 234 "/Reform 2 Power/VREG"))
+      (net 226 "/Reform 2 Power/VREG"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9165,7 +9542,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0639DE)
-    (at 287 119.5 90)
+    (at 261.5 109.5 90)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5D88AFDD)
@@ -9190,9 +9567,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 293 "Net-(L1-Pad2)"))
+      (net 285 "Net-(L1-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 306 BATPWR))
+      (net 298 BATPWR))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9201,7 +9578,7 @@
   )
 
   (module Resistor_SMD:R_0603_1608Metric (layer F.Cu) (tedit 5B301BBD) (tstamp 5D0639CD)
-    (at 278 117)
+    (at 252.5 107)
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags resistor)
     (path /5CC81028/5DB124FB)
@@ -9226,9 +9603,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 426 "Net-(C34-Pad1)"))
+      (net 418 "Net-(C34-Pad1)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 470 "Net-(Q1-Pad5)"))
+      (net 462 "Net-(Q1-Pad5)"))
     (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9236,8 +9613,8 @@
     )
   )
 
-  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5D0639BC)
-    (at 43 137)
+  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5D1DDA26)
+    (at 68.5 126.5)
     (descr "SOT-23, Standard")
     (tags SOT-23)
     (path /5CC81028/5D1C46F4)
@@ -9265,11 +9642,11 @@
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 269 "Net-(D18-Pad2)"))
+      (net 261 "Net-(D18-Pad2)"))
     (pad 2 smd rect (at -1 0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 229 "Net-(BT7-Pad2)"))
+      (net 681 BAT8+))
     (pad 1 smd rect (at -1 -0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 314 "Net-(Q12-Pad1)"))
+      (net 306 "Net-(Q12-Pad1)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9278,7 +9655,7 @@
   )
 
   (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5D0639A7)
-    (at 64 136.5)
+    (at 80 126.5)
     (descr "SOT-23, Standard")
     (tags SOT-23)
     (path /5CC81028/5D0365AF)
@@ -9306,11 +9683,11 @@
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 267 "Net-(D17-Pad2)"))
+      (net 259 "Net-(D17-Pad2)"))
     (pad 2 smd rect (at -1 0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 228 "Net-(BT6-Pad2)"))
+      (net 680 BAT7+))
     (pad 1 smd rect (at -1 -0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 313 "Net-(Q11-Pad1)"))
+      (net 305 "Net-(Q11-Pad1)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9319,7 +9696,7 @@
   )
 
   (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5D063992)
-    (at 87 136.5)
+    (at 107 126.5)
     (descr "SOT-23, Standard")
     (tags SOT-23)
     (path /5CC81028/5D0A6A00)
@@ -9347,11 +9724,11 @@
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 265 "Net-(D16-Pad2)"))
+      (net 257 "Net-(D16-Pad2)"))
     (pad 2 smd rect (at -1 0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 227 "Net-(BT5-Pad2)"))
+      (net 679 BAT6+))
     (pad 1 smd rect (at -1 -0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 312 "Net-(Q10-Pad1)"))
+      (net 304 "Net-(Q10-Pad1)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9360,7 +9737,7 @@
   )
 
   (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5D06397D)
-    (at 110.5 136)
+    (at 117.5 126.5)
     (descr "SOT-23, Standard")
     (tags SOT-23)
     (path /5CC81028/5D0B0671)
@@ -9388,11 +9765,11 @@
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 263 "Net-(D15-Pad2)"))
+      (net 255 "Net-(D15-Pad2)"))
     (pad 2 smd rect (at -1 0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 226 "Net-(BT4-Pad2)"))
+      (net 678 BAT5+))
     (pad 1 smd rect (at -1 -0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 311 "Net-(Q9-Pad1)"))
+      (net 303 "Net-(Q9-Pad1)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9400,8 +9777,8 @@
     )
   )
 
-  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5D063968)
-    (at 230.5 136)
+  (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5D1D07CE)
+    (at 230 126)
     (descr "SOT-23, Standard")
     (tags SOT-23)
     (path /5CC81028/5D0B8536)
@@ -9429,11 +9806,11 @@
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 261 "Net-(D14-Pad2)"))
+      (net 253 "Net-(D14-Pad2)"))
     (pad 2 smd rect (at -1 0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 225 "Net-(BT3-Pad2)"))
+      (net 677 BAT4+))
     (pad 1 smd rect (at -1 -0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 310 "Net-(Q8-Pad1)"))
+      (net 302 "Net-(Q8-Pad1)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9442,7 +9819,7 @@
   )
 
   (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5D063953)
-    (at 250 136.5)
+    (at 241 127)
     (descr "SOT-23, Standard")
     (tags SOT-23)
     (path /5CC81028/5D0C307D)
@@ -9470,11 +9847,11 @@
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 259 "Net-(D13-Pad2)"))
+      (net 251 "Net-(D13-Pad2)"))
     (pad 2 smd rect (at -1 0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 224 "Net-(BT2-Pad2)"))
+      (net 676 BAT3+))
     (pad 1 smd rect (at -1 -0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 309 "Net-(Q7-Pad1)"))
+      (net 301 "Net-(Q7-Pad1)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9483,7 +9860,7 @@
   )
 
   (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5D06393E)
-    (at 272.5 136.5)
+    (at 266.5 126.5)
     (descr "SOT-23, Standard")
     (tags SOT-23)
     (path /5CC81028/5D0F8682)
@@ -9511,11 +9888,11 @@
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 257 "Net-(D12-Pad2)"))
+      (net 249 "Net-(D12-Pad2)"))
     (pad 2 smd rect (at -1 0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 222 "Net-(BT1-Pad2)"))
+      (net 675 BAT2+))
     (pad 1 smd rect (at -1 -0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 308 "Net-(Q6-Pad1)"))
+      (net 300 "Net-(Q6-Pad1)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9524,7 +9901,7 @@
   )
 
   (module Package_TO_SOT_SMD:SOT-23 (layer F.Cu) (tedit 5A02FF57) (tstamp 5D063929)
-    (at 296 136.5)
+    (at 275.5 128.5)
     (descr "SOT-23, Standard")
     (tags SOT-23)
     (path /5CC81028/5D090C6C)
@@ -9552,11 +9929,11 @@
       (effects (font (size 0.5 0.5) (thickness 0.075)))
     )
     (pad 3 smd rect (at 1 0) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 255 "Net-(D11-Pad2)"))
+      (net 247 "Net-(D11-Pad2)"))
     (pad 2 smd rect (at -1 0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 223 "Net-(BT1-Pad1)"))
+      (net 674 BAT1+))
     (pad 1 smd rect (at -1 -0.95) (size 0.9 0.8) (layers F.Cu F.Paste F.Mask)
-      (net 307 "Net-(Q5-Pad1)"))
+      (net 299 "Net-(Q5-Pad1)"))
     (model ${KISYS3DMOD}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9564,8 +9941,8 @@
     )
   )
 
-  (module footprints:PULSE_J0G-0003NL (layer F.Cu) (tedit 5A1DB0FC) (tstamp 5D06389C)
-    (at 302.3 54 270)
+  (module footprints:PULSE_J0G-0003NL (layer F.Cu) (tedit 5A1DB0FC) (tstamp 5D1E7E66)
+    (at 302.3 68 270)
     (path /5D06A32E/5A04FC73)
     (fp_text reference P1 (at 0.02 11.95 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -9595,39 +9972,39 @@
     (fp_line (start 9.25 -1.5) (end 9.25 -13.5) (layer Dwgs.User) (width 0.05))
     (fp_circle (center -9.66 6.6) (end -9.46 6.6) (layer F.SilkS) (width 0.4))
     (pad 10 thru_hole circle (at 2.035 9.14 270) (size 1.398 1.398) (drill 0.89) (layers *.Cu *.Mask F.SilkS)
-      (net 294 ETH0_A-))
+      (net 286 ETH0_A-))
     (pad 11 thru_hole circle (at 4.065 9.14 270) (size 1.398 1.398) (drill 0.89) (layers *.Cu *.Mask F.SilkS)
-      (net 295 ETH0_A+))
+      (net 287 ETH0_A+))
     (pad 12 thru_hole circle (at 6.095 9.14 270) (size 1.398 1.398) (drill 0.89) (layers *.Cu *.Mask F.SilkS)
-      (net 244 "Net-(C26-Pad1)"))
+      (net 236 "Net-(C26-Pad1)"))
     (pad 9 thru_hole circle (at -2.035 9.14 270) (size 1.398 1.398) (drill 0.89) (layers *.Cu *.Mask F.SilkS)
-      (net 296 ETH0_D-))
+      (net 288 ETH0_D-))
     (pad 8 thru_hole circle (at -4.065 9.14 270) (size 1.398 1.398) (drill 0.89) (layers *.Cu *.Mask F.SilkS)
-      (net 297 ETH0_D+))
+      (net 289 ETH0_D+))
     (pad 7 thru_hole circle (at -6.095 9.14 270) (size 1.398 1.398) (drill 0.89) (layers *.Cu *.Mask F.SilkS)
-      (net 241 "Net-(C23-Pad1)"))
+      (net 233 "Net-(C23-Pad1)"))
     (pad 4 thru_hole circle (at 1.015 6.6 270) (size 1.398 1.398) (drill 0.89) (layers *.Cu *.Mask F.SilkS)
-      (net 298 ETH0_B+))
+      (net 290 ETH0_B+))
     (pad 3 thru_hole circle (at -1.015 6.6 270) (size 1.398 1.398) (drill 0.89) (layers *.Cu *.Mask F.SilkS)
-      (net 299 ETH0_C+))
+      (net 291 ETH0_C+))
     (pad 2 thru_hole circle (at -3.045 6.6 270) (size 1.398 1.398) (drill 0.89) (layers *.Cu *.Mask F.SilkS)
-      (net 300 ETH0_C-))
+      (net 292 ETH0_C-))
     (pad 1 thru_hole rect (at -5.075 6.6 270) (size 1.398 1.398) (drill 0.89) (layers *.Cu *.Mask F.SilkS)
-      (net 242 "Net-(C24-Pad1)"))
+      (net 234 "Net-(C24-Pad1)"))
     (pad 5 thru_hole circle (at 3.045 6.6 270) (size 1.398 1.398) (drill 0.89) (layers *.Cu *.Mask F.SilkS)
-      (net 301 ETH0_B-))
+      (net 293 ETH0_B-))
     (pad 6 thru_hole circle (at 5.075 6.6 270) (size 1.398 1.398) (drill 0.89) (layers *.Cu *.Mask F.SilkS)
-      (net 243 "Net-(C25-Pad1)"))
+      (net 235 "Net-(C25-Pad1)"))
     (pad 17 thru_hole circle (at 7.52 -8.89 270) (size 1.905 1.905) (drill 1.27) (layers *.Cu *.Mask F.SilkS)
-      (net 302 ETH0_LED_RX))
+      (net 294 ETH0_LED_RX))
     (pad 16 thru_hole circle (at 7.52 -6.35 270) (size 1.905 1.905) (drill 1.27) (layers *.Cu *.Mask F.SilkS)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad 15 thru_hole circle (at 7.52 -3.81 270) (size 1.905 1.905) (drill 1.27) (layers *.Cu *.Mask F.SilkS)
-      (net 303 "Net-(P1-Pad15)"))
+      (net 295 "Net-(P1-Pad15)"))
     (pad 14 thru_hole circle (at -7.52 -8.89 270) (size 1.905 1.905) (drill 1.27) (layers *.Cu *.Mask F.SilkS)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad 13 thru_hole circle (at -7.52 -6.35 270) (size 1.905 1.905) (drill 1.27) (layers *.Cu *.Mask F.SilkS)
-      (net 304 ETH0_LED_LINK))
+      (net 296 ETH0_LED_LINK))
     (pad Hole np_thru_hole circle (at 4.825 0 270) (size 3.2 3.2) (drill 3.2) (layers))
     (pad Hole np_thru_hole circle (at -4.825 0 270) (size 3.2 3.2) (drill 3.2) (layers))
     (pad SH2 thru_hole circle (at 8.79 0 270) (size 2.355 2.355) (drill 1.57) (layers *.Cu *.Mask F.SilkS)
@@ -9667,9 +10044,9 @@
     (fp_line (start -2.25 -1.6) (end 2.25 -1.6) (layer F.Fab) (width 0.1))
     (fp_line (start -2.25 1.6) (end -2.25 -1.6) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 2.1375 0 270) (size 1.125 3.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.222222)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad 1 smd roundrect (at -2.1375 0 270) (size 1.125 3.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.222222)
-      (net 444 "Net-(D21-Pad1)"))
+      (net 436 "Net-(D21-Pad1)"))
     (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1812_4532Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9703,9 +10080,9 @@
     (fp_line (start -2.25 -1.6) (end 2.25 -1.6) (layer F.Fab) (width 0.1))
     (fp_line (start -2.25 1.6) (end -2.25 -1.6) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 2.1375 0 270) (size 1.125 3.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.222222)
-      (net 238 +5V))
+      (net 230 +5V))
     (pad 1 smd roundrect (at -2.1375 0 270) (size 1.125 3.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.222222)
-      (net 443 "Net-(D20-Pad1)"))
+      (net 435 "Net-(D20-Pad1)"))
     (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1812_4532Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9714,7 +10091,7 @@
   )
 
   (module Inductor_SMD:L_1812_4532Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D06384C)
-    (at 239.5 118.5 90)
+    (at 226.5 117 90)
     (descr "Inductor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
     (tags inductor)
     (path /5CC81028/5D30FC91)
@@ -9739,9 +10116,9 @@
     (fp_line (start -2.25 -1.6) (end 2.25 -1.6) (layer F.Fab) (width 0.1))
     (fp_line (start -2.25 1.6) (end -2.25 -1.6) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 2.1375 0 90) (size 1.125 3.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.222222)
-      (net 247 "Net-(D1-Pad1)"))
+      (net 239 "Net-(D1-Pad1)"))
     (pad 1 smd roundrect (at -2.1375 0 90) (size 1.125 3.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.222222)
-      (net 223 "Net-(BT1-Pad1)"))
+      (net 674 BAT1+))
     (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1812_4532Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9750,7 +10127,7 @@
   )
 
   (module Inductor_SMD:L_1812_4532Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D06383B)
-    (at 288 113.5 270)
+    (at 262.5 103.5 270)
     (descr "Inductor SMD 1812 (4532 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://www.nikhef.nl/pub/departments/mt/projects/detectorR_D/dtddice/ERJ2G.pdf), generated with kicad-footprint-generator")
     (tags inductor)
     (path /5CC81028/5D91FA2C)
@@ -9775,9 +10152,9 @@
     (fp_line (start -2.25 -1.6) (end 2.25 -1.6) (layer F.Fab) (width 0.1))
     (fp_line (start -2.25 1.6) (end -2.25 -1.6) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 2.1375 0 270) (size 1.125 3.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.222222)
-      (net 293 "Net-(L1-Pad2)"))
+      (net 285 "Net-(L1-Pad2)"))
     (pad 1 smd roundrect (at -2.1375 0 270) (size 1.125 3.4) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.222222)
-      (net 230 "Net-(C1-Pad2)"))
+      (net 222 "Net-(C1-Pad2)"))
     (model ${KISYS3DMOD}/Inductor_SMD.3dshapes/L_1812_4532Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9786,7 +10163,7 @@
   )
 
   (module Connector_FFC-FPC:Hirose_FH12-30S-0.5SH_1x30-1MP_P0.50mm_Horizontal (layer F.Cu) (tedit 5AEE0F8A) (tstamp 5D0637A2)
-    (at 245 47 180)
+    (at 83 51 180)
     (descr "Molex FH12, FFC/FPC connector, FH12-30S-0.5SH, 30 Pins per row (https://www.hirose.com/product/en/products/FH12/FH12-24S-0.5SH(55)/), generated with kicad-footprint-generator")
     (tags "connector Hirose  top entry")
     (path /5D06A7B6/5DA8371C)
@@ -9829,65 +10206,65 @@
     (fp_line (start -9.05 -1.2) (end -9.05 3.4) (layer F.Fab) (width 0.1))
     (fp_line (start 0 -1.2) (end -9.05 -1.2) (layer F.Fab) (width 0.1))
     (pad 30 smd rect (at 7.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 271 "Net-(J2-Pad30)"))
+      (net 263 "Net-(J2-Pad30)"))
     (pad 29 smd rect (at 6.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 272 "/Reform 2 Display/EDP_BL_VCC"))
+      (net 264 "/Reform 2 Display/EDP_BL_VCC"))
     (pad 28 smd rect (at 6.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 272 "/Reform 2 Display/EDP_BL_VCC"))
+      (net 264 "/Reform 2 Display/EDP_BL_VCC"))
     (pad 27 smd rect (at 5.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 272 "/Reform 2 Display/EDP_BL_VCC"))
+      (net 264 "/Reform 2 Display/EDP_BL_VCC"))
     (pad 26 smd rect (at 5.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 272 "/Reform 2 Display/EDP_BL_VCC"))
+      (net 264 "/Reform 2 Display/EDP_BL_VCC"))
     (pad 25 smd rect (at 4.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 273 "Net-(J2-Pad25)"))
+      (net 265 "Net-(J2-Pad25)"))
     (pad 24 smd rect (at 4.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 274 "Net-(J2-Pad24)"))
+      (net 266 "Net-(J2-Pad24)"))
     (pad 23 smd rect (at 3.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 275 "/Reform 2 Display/EDP_BL_PWM"))
+      (net 267 "/Reform 2 Display/EDP_BL_PWM"))
     (pad 22 smd rect (at 3.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 276 "/Reform 2 Display/EDP_BL_ENABLE"))
+      (net 268 "/Reform 2 Display/EDP_BL_ENABLE"))
     (pad 21 smd rect (at 2.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 277 "/Reform 2 Display/EDP_BL_GND"))
+      (net 269 "/Reform 2 Display/EDP_BL_GND"))
     (pad 20 smd rect (at 2.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 277 "/Reform 2 Display/EDP_BL_GND"))
+      (net 269 "/Reform 2 Display/EDP_BL_GND"))
     (pad 19 smd rect (at 1.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 277 "/Reform 2 Display/EDP_BL_GND"))
+      (net 269 "/Reform 2 Display/EDP_BL_GND"))
     (pad 18 smd rect (at 1.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 277 "/Reform 2 Display/EDP_BL_GND"))
+      (net 269 "/Reform 2 Display/EDP_BL_GND"))
     (pad 17 smd rect (at 0.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 278 "/Reform 2 Display/EDP_HPD"))
+      (net 270 "/Reform 2 Display/EDP_HPD"))
     (pad 16 smd rect (at 0.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 279 "/Reform 2 Display/EDP_LCD_VCC"))
+      (net 271 "/Reform 2 Display/EDP_LCD_VCC"))
     (pad 15 smd rect (at -0.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 279 "/Reform 2 Display/EDP_LCD_VCC"))
+      (net 271 "/Reform 2 Display/EDP_LCD_VCC"))
     (pad 14 smd rect (at -0.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 280 "/Reform 2 Display/EDP_LCD_TEST"))
+      (net 272 "/Reform 2 Display/EDP_LCD_TEST"))
     (pad 13 smd rect (at -1.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 279 "/Reform 2 Display/EDP_LCD_VCC"))
+      (net 271 "/Reform 2 Display/EDP_LCD_VCC"))
     (pad 12 smd rect (at -1.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 279 "/Reform 2 Display/EDP_LCD_VCC"))
+      (net 271 "/Reform 2 Display/EDP_LCD_VCC"))
     (pad 11 smd rect (at -2.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 10 smd rect (at -2.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 281 EDP_AUX_DN))
+      (net 273 EDP_AUX_DN))
     (pad 9 smd rect (at -3.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 282 EDP_AUX_DP))
+      (net 274 EDP_AUX_DP))
     (pad 8 smd rect (at -3.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 7 smd rect (at -4.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 283 EDP_TX0_DN))
+      (net 275 EDP_TX0_DN))
     (pad 6 smd rect (at -4.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 284 EDP_TX0_DP))
+      (net 276 EDP_TX0_DP))
     (pad 5 smd rect (at -5.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 4 smd rect (at -5.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 285 EDP_TX1_DN))
+      (net 277 EDP_TX1_DN))
     (pad 3 smd rect (at -6.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 286 EDP_TX1_DP))
+      (net 278 EDP_TX1_DP))
     (pad 2 smd rect (at -6.75 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 1 smd rect (at -7.25 -1.85 180) (size 0.3 1.3) (layers F.Cu F.Paste F.Mask)
-      (net 287 "Net-(J2-Pad1)"))
+      (net 279 "Net-(J2-Pad1)"))
     (pad MP smd rect (at -9.15 1.4 180) (size 1.8 2.2) (layers F.Cu F.Paste F.Mask))
     (pad MP smd rect (at 9.15 1.4 180) (size 1.8 2.2) (layers F.Cu F.Paste F.Mask))
     (model ${KIPRJMOD}/3d-models/FH12-30S-0.5SH.wrl
@@ -9897,8 +10274,8 @@
     )
   )
 
-  (module footprints:SWC_RAPC712X (layer F.Cu) (tedit 5A65FEE8) (tstamp 5D063761)
-    (at 305.2 78.1 90)
+  (module footprints:SWC_RAPC712X (layer F.Cu) (tedit 5A65FEE8) (tstamp 5D1EC526)
+    (at 305.17 50.94 90)
     (path /5CC81028/5CC82E0E)
     (attr smd)
     (fp_text reference J1 (at -3.6 -4.8 90) (layer F.SilkS)
@@ -9922,16 +10299,16 @@
     (pad 2 thru_hole oval (at 4.8 0 180) (size 4 1.8) (drill oval 3 0.75) (layers *.Cu *.Mask)
       (net 40 GND))
     (pad 1 thru_hole oval (at 0 -3 90) (size 4 2) (drill oval 3 1) (layers *.Cu *.Mask)
-      (net 423 +36V))
-    (model /media/storage2/kicad-packages3D-master/Connectors.3dshapes/RAPC722.wrl
-      (offset (xyz -3.301999950408935 -8.127999877929687 2.539999961853027))
+      (net 415 +36V))
+    (model ${KIPRJMOD}/3d-models/SW3dPS-rapc722.STEP
+      (offset (xyz 0 1.2 0))
       (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 90))
+      (rotate (xyz -90 0 -90))
     )
   )
 
-  (module LED_SMD:LED_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D06374F)
-    (at 43 140)
+  (module LED_SMD:LED_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D1DD9EE)
+    (at 68.5 129.5)
     (descr "LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags diode)
     (path /5CC81028/5D1C4729)
@@ -9958,9 +10335,9 @@
     (fp_line (start -0.5 -0.4) (end -0.8 -0.1) (layer F.Fab) (width 0.1))
     (fp_line (start 0.8 -0.4) (end -0.5 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 269 "Net-(D18-Pad2)"))
+      (net 261 "Net-(D18-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 270 "Net-(D18-Pad1)"))
+      (net 262 "Net-(D18-Pad1)"))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9969,7 +10346,7 @@
   )
 
   (module LED_SMD:LED_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D06373C)
-    (at 64 139.5)
+    (at 80 129.5)
     (descr "LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags diode)
     (path /5CC81028/5D064FD2)
@@ -9996,9 +10373,9 @@
     (fp_line (start -0.5 -0.4) (end -0.8 -0.1) (layer F.Fab) (width 0.1))
     (fp_line (start 0.8 -0.4) (end -0.5 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 267 "Net-(D17-Pad2)"))
+      (net 259 "Net-(D17-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 268 "Net-(D17-Pad1)"))
+      (net 260 "Net-(D17-Pad1)"))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10007,7 +10384,7 @@
   )
 
   (module LED_SMD:LED_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D063729)
-    (at 87 139.5)
+    (at 107 129.5)
     (descr "LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags diode)
     (path /5CC81028/5D0A6A32)
@@ -10034,9 +10411,9 @@
     (fp_line (start -0.5 -0.4) (end -0.8 -0.1) (layer F.Fab) (width 0.1))
     (fp_line (start 0.8 -0.4) (end -0.5 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 265 "Net-(D16-Pad2)"))
+      (net 257 "Net-(D16-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 266 "Net-(D16-Pad1)"))
+      (net 258 "Net-(D16-Pad1)"))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10045,7 +10422,7 @@
   )
 
   (module LED_SMD:LED_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D063716)
-    (at 110.5 139)
+    (at 117.5 129.5)
     (descr "LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags diode)
     (path /5CC81028/5D0B06A3)
@@ -10072,9 +10449,9 @@
     (fp_line (start -0.5 -0.4) (end -0.8 -0.1) (layer F.Fab) (width 0.1))
     (fp_line (start 0.8 -0.4) (end -0.5 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 263 "Net-(D15-Pad2)"))
+      (net 255 "Net-(D15-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 264 "Net-(D15-Pad1)"))
+      (net 256 "Net-(D15-Pad1)"))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10082,8 +10459,8 @@
     )
   )
 
-  (module LED_SMD:LED_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D063703)
-    (at 228 139.5)
+  (module LED_SMD:LED_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D1D06BB)
+    (at 227.5 129.5)
     (descr "LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags diode)
     (path /5CC81028/5D0B8568)
@@ -10110,9 +10487,9 @@
     (fp_line (start -0.5 -0.4) (end -0.8 -0.1) (layer F.Fab) (width 0.1))
     (fp_line (start 0.8 -0.4) (end -0.5 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 261 "Net-(D14-Pad2)"))
+      (net 253 "Net-(D14-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 262 "Net-(D14-Pad1)"))
+      (net 254 "Net-(D14-Pad1)"))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10121,7 +10498,7 @@
   )
 
   (module LED_SMD:LED_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0636F0)
-    (at 250 139.5)
+    (at 241 130)
     (descr "LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags diode)
     (path /5CC81028/5D0C30AF)
@@ -10148,9 +10525,9 @@
     (fp_line (start -0.5 -0.4) (end -0.8 -0.1) (layer F.Fab) (width 0.1))
     (fp_line (start 0.8 -0.4) (end -0.5 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 259 "Net-(D13-Pad2)"))
+      (net 251 "Net-(D13-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 260 "Net-(D13-Pad1)"))
+      (net 252 "Net-(D13-Pad1)"))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10159,7 +10536,7 @@
   )
 
   (module LED_SMD:LED_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0636DD)
-    (at 272.5 139.5)
+    (at 266.5 129.5)
     (descr "LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags diode)
     (path /5CC81028/5D0F86B4)
@@ -10186,9 +10563,9 @@
     (fp_line (start -0.5 -0.4) (end -0.8 -0.1) (layer F.Fab) (width 0.1))
     (fp_line (start 0.8 -0.4) (end -0.5 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 257 "Net-(D12-Pad2)"))
+      (net 249 "Net-(D12-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 258 "Net-(D12-Pad1)"))
+      (net 250 "Net-(D12-Pad1)"))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10197,7 +10574,7 @@
   )
 
   (module LED_SMD:LED_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0636CA)
-    (at 296 139.5)
+    (at 272 129.5)
     (descr "LED SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags diode)
     (path /5CC81028/5D090CA1)
@@ -10224,9 +10601,9 @@
     (fp_line (start -0.5 -0.4) (end -0.8 -0.1) (layer F.Fab) (width 0.1))
     (fp_line (start 0.8 -0.4) (end -0.5 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 255 "Net-(D11-Pad2)"))
+      (net 247 "Net-(D11-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 256 "Net-(D11-Pad1)"))
+      (net 248 "Net-(D11-Pad1)"))
     (model ${KISYS3DMOD}/LED_SMD.3dshapes/LED_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10234,8 +10611,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323 (layer F.Cu) (tedit 58641739) (tstamp 5D0636B7)
-    (at 47 133.5 180)
+  (module Diode_SMD:D_SOD-323 (layer F.Cu) (tedit 58641739) (tstamp 5D1DD94E)
+    (at 72.5 124.5 180)
     (descr SOD-323)
     (tags SOD-323)
     (path /5CC81028/5D1C4756)
@@ -10269,7 +10646,7 @@
     (pad 2 smd rect (at 1.05 0 180) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 1 smd rect (at -1.05 0 180) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 254 "Net-(D10-Pad1)"))
+      (net 246 "Net-(D10-Pad1)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10278,15 +10655,15 @@
   )
 
   (module Diode_SMD:D_SOD-323 (layer F.Cu) (tedit 58641739) (tstamp 5D06369F)
-    (at 56.5 138 270)
+    (at 72.5 122)
     (descr SOD-323)
     (tags SOD-323)
     (path /5CC81028/5D079550)
     (attr smd)
-    (fp_text reference D9 (at 0 -1.85 90) (layer F.SilkS)
+    (fp_text reference D9 (at 0 -1.85) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value PDZ7.5B (at 0.1 1.9 90) (layer F.Fab)
+    (fp_text value PDZ7.5B (at 0.1 1.9) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.5 -0.85) (end 1.05 -0.85) (layer F.SilkS) (width 0.12))
@@ -10306,13 +10683,13 @@
     (fp_line (start 0.2 0.35) (end -0.3 0) (layer F.Fab) (width 0.1))
     (fp_line (start 0.2 0) (end 0.45 0) (layer F.Fab) (width 0.1))
     (fp_line (start -1.5 -0.85) (end -1.5 0.85) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 0 -1.85 90) (layer F.Fab)
+    (fp_text user %R (at 0 -1.85) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 2 smd rect (at 1.05 0 270) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 254 "Net-(D10-Pad1)"))
-    (pad 1 smd rect (at -1.05 0 270) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 253 "Net-(D8-Pad2)"))
+    (pad 2 smd rect (at 1.05 0) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
+      (net 246 "Net-(D10-Pad1)"))
+    (pad 1 smd rect (at -1.05 0) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
+      (net 245 "Net-(D8-Pad2)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10321,7 +10698,7 @@
   )
 
   (module Diode_SMD:D_SOD-323 (layer F.Cu) (tedit 58641739) (tstamp 5D063687)
-    (at 79.5 134.5 180)
+    (at 85.5 127.5 180)
     (descr SOD-323)
     (tags SOD-323)
     (path /5CC81028/5D0A6A5E)
@@ -10353,9 +10730,9 @@
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 2 smd rect (at 1.05 0 180) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 253 "Net-(D8-Pad2)"))
+      (net 245 "Net-(D8-Pad2)"))
     (pad 1 smd rect (at -1.05 0 180) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 252 "Net-(D7-Pad2)"))
+      (net 244 "Net-(D7-Pad2)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10364,7 +10741,7 @@
   )
 
   (module Diode_SMD:D_SOD-323 (layer F.Cu) (tedit 58641739) (tstamp 5D06366F)
-    (at 102.5 135 180)
+    (at 110.5 123)
     (descr SOD-323)
     (tags SOD-323)
     (path /5CC81028/5D0B06CF)
@@ -10395,10 +10772,10 @@
     (fp_text user %R (at 0 -1.85) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 2 smd rect (at 1.05 0 180) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 252 "Net-(D7-Pad2)"))
-    (pad 1 smd rect (at -1.05 0 180) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 251 "Net-(D6-Pad2)"))
+    (pad 2 smd rect (at 1.05 0) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
+      (net 244 "Net-(D7-Pad2)"))
+    (pad 1 smd rect (at -1.05 0) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
+      (net 243 "Net-(D6-Pad2)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10407,7 +10784,7 @@
   )
 
   (module Diode_SMD:D_SOD-323 (layer F.Cu) (tedit 58641739) (tstamp 5D063657)
-    (at 126.5 135)
+    (at 123.5 127.5)
     (descr SOD-323)
     (tags SOD-323)
     (path /5CC81028/5D0B8594)
@@ -10439,9 +10816,9 @@
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 2 smd rect (at 1.05 0) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 251 "Net-(D6-Pad2)"))
+      (net 243 "Net-(D6-Pad2)"))
     (pad 1 smd rect (at -1.05 0) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 250 "Net-(D5-Pad2)"))
+      (net 242 "Net-(D5-Pad2)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10449,8 +10826,8 @@
     )
   )
 
-  (module Diode_SMD:D_SOD-323 (layer F.Cu) (tedit 58641739) (tstamp 5D06363F)
-    (at 242.5 133 180)
+  (module Diode_SMD:D_SOD-323 (layer F.Cu) (tedit 58641739) (tstamp 5D1D0756)
+    (at 234 127 180)
     (descr SOD-323)
     (tags SOD-323)
     (path /5CC81028/5D0C30DB)
@@ -10482,9 +10859,9 @@
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 2 smd rect (at 1.05 0 180) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 250 "Net-(D5-Pad2)"))
+      (net 242 "Net-(D5-Pad2)"))
     (pad 1 smd rect (at -1.05 0 180) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 249 "Net-(D4-Pad2)"))
+      (net 241 "Net-(D4-Pad2)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10493,7 +10870,7 @@
   )
 
   (module Diode_SMD:D_SOD-323 (layer F.Cu) (tedit 58641739) (tstamp 5D063627)
-    (at 265 133)
+    (at 245 126.5)
     (descr SOD-323)
     (tags SOD-323)
     (path /5CC81028/5D0F86E0)
@@ -10525,9 +10902,9 @@
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 2 smd rect (at 1.05 0) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 249 "Net-(D4-Pad2)"))
+      (net 241 "Net-(D4-Pad2)"))
     (pad 1 smd rect (at -1.05 0) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 248 "Net-(D3-Pad2)"))
+      (net 240 "Net-(D3-Pad2)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10536,12 +10913,12 @@
   )
 
   (module Diode_SMD:D_SOD-323 (layer F.Cu) (tedit 58641739) (tstamp 5D06360F)
-    (at 288 133 180)
+    (at 270.5 124 180)
     (descr SOD-323)
     (tags SOD-323)
     (path /5CC81028/5D090CCE)
     (attr smd)
-    (fp_text reference D3 (at 0 -1.85) (layer F.SilkS)
+    (fp_text reference D3 (at 0 1.5) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value PDZ7.5B (at 0.1 1.9) (layer F.Fab)
@@ -10568,9 +10945,9 @@
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 2 smd rect (at 1.05 0 180) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 248 "Net-(D3-Pad2)"))
+      (net 240 "Net-(D3-Pad2)"))
     (pad 1 smd rect (at -1.05 0 180) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 440 "Net-(D3-Pad1)"))
+      (net 432 "Net-(D3-Pad1)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10579,7 +10956,7 @@
   )
 
   (module Diode_SMD:D_SOD-323 (layer F.Cu) (tedit 58641739) (tstamp 5D0635F7)
-    (at 238 110 90)
+    (at 225 108.5 90)
     (descr SOD-323)
     (tags SOD-323)
     (path /5CC81028/5D3259C9)
@@ -10613,7 +10990,7 @@
     (pad 2 smd rect (at 1.05 0 90) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad 1 smd rect (at -1.05 0 90) (size 0.6 0.45) (layers F.Cu F.Paste F.Mask)
-      (net 247 "Net-(D1-Pad1)"))
+      (net 239 "Net-(D1-Pad1)"))
     (model ${KISYS3DMOD}/Diode_SMD.3dshapes/D_SOD-323.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10622,7 +10999,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0635C7)
-    (at 57 56.25)
+    (at 57 62.25)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D0D8363/5D14719E)
@@ -10649,7 +11026,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 246 "Net-(C30-Pad1)"))
+      (net 238 "Net-(C30-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10658,7 +11035,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0635B6)
-    (at 66.995 42.75)
+    (at 63 51.5)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D0D8363/5D156EA0)
@@ -10685,7 +11062,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10694,7 +11071,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0635A5)
-    (at 60.155 41.38 180)
+    (at 60.155 47.38 180)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D0D8363/5D15C03F)
@@ -10719,7 +11096,7 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 238 +5V))
+      (net 230 +5V))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
@@ -10730,7 +11107,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D063594)
-    (at 60.5 56.25 180)
+    (at 60.5 62.25 180)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D0D8363/5D171FA3)
@@ -10755,7 +11132,7 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 245 "Net-(C27-Pad2)"))
+      (net 237 "Net-(C27-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
@@ -10765,13 +11142,13 @@
     )
   )
 
-  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D110414)
-    (at 292.5 65)
+  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D1E7D62)
+    (at 292.5 79)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A32E/5A05141B)
     (attr smd)
-    (fp_text reference C26 (at 0 -1.43) (layer F.SilkS)
+    (fp_text reference C26 (at 0 1.57) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 0.1uF (at 0 1.43) (layer F.Fab)
@@ -10793,7 +11170,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 244 "Net-(C26-Pad1)"))
+      (net 236 "Net-(C26-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10801,13 +11178,13 @@
     )
   )
 
-  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D063572)
-    (at 296.5 65)
+  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D1E7D32)
+    (at 296.5 79)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A32E/5A0513CA)
     (attr smd)
-    (fp_text reference C25 (at 0 -1.43) (layer F.SilkS)
+    (fp_text reference C25 (at 0 1.57) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 0.1uF (at 0 1.43) (layer F.Fab)
@@ -10829,7 +11206,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 243 "Net-(C25-Pad1)"))
+      (net 235 "Net-(C25-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10837,8 +11214,8 @@
     )
   )
 
-  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D063561)
-    (at 296.5 43)
+  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D1E7D02)
+    (at 296.5 57)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A32E/5A051336)
@@ -10865,7 +11242,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 242 "Net-(C24-Pad1)"))
+      (net 234 "Net-(C24-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10873,8 +11250,8 @@
     )
   )
 
-  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D063550)
-    (at 292.5 43)
+  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D1E7CD2)
+    (at 292.5 57)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A32E/5A05122D)
@@ -10901,7 +11278,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 241 "Net-(C23-Pad1)"))
+      (net 233 "Net-(C23-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10909,8 +11286,8 @@
     )
   )
 
-  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D06353F)
-    (at 307.5 66 180)
+  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D1E7C9F)
+    (at 307.5 79 180)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A32E/5A04FD85)
@@ -10937,7 +11314,7 @@
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10946,7 +11323,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D06352E)
-    (at 81.5 109 90)
+    (at 74 102 90)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A2FD/5D1A9B13)
@@ -10973,7 +11350,7 @@
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 240 "Net-(C21-Pad1)"))
+      (net 232 "Net-(C21-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10982,7 +11359,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D06351D)
-    (at 90 109 90)
+    (at 82.5 102 90)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5D06A2FD/5D1A9B1F)
@@ -11009,7 +11386,7 @@
     (pad 2 smd roundrect (at 0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 90) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 239 "Net-(C20-Pad1)"))
+      (net 231 "Net-(C20-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11045,7 +11422,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11081,7 +11458,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 238 +5V))
+      (net 230 +5V))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11117,7 +11494,7 @@
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 237 "Net-(C16-Pad1)"))
+      (net 229 "Net-(C16-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11153,7 +11530,7 @@
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 237 "Net-(C16-Pad1)"))
+      (net 229 "Net-(C16-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11161,8 +11538,8 @@
     )
   )
 
-  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0634C8)
-    (at 45 138.5 270)
+  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D1DD98C)
+    (at 70.5 128 270)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D1C4740)
@@ -11189,7 +11566,7 @@
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 229 "Net-(BT7-Pad2)"))
+      (net 681 BAT8+))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11198,7 +11575,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0634B7)
-    (at 66.5 138.5 270)
+    (at 82.5 128.5 270)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D0718A2)
@@ -11225,7 +11602,7 @@
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 228 "Net-(BT6-Pad2)"))
+      (net 680 BAT7+))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11234,7 +11611,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0634A6)
-    (at 89.5 138.5 270)
+    (at 109.5 128.5 270)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D0A6A48)
@@ -11261,7 +11638,7 @@
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 227 "Net-(BT5-Pad2)"))
+      (net 679 BAT6+))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11270,7 +11647,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D063495)
-    (at 113 138 270)
+    (at 120 128.5 270)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D0B06B9)
@@ -11297,7 +11674,7 @@
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 226 "Net-(BT4-Pad2)"))
+      (net 678 BAT5+))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11305,8 +11682,8 @@
     )
   )
 
-  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D063484)
-    (at 233 133)
+  (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D1D0794)
+    (at 232.5 123)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D0B857E)
@@ -11333,7 +11710,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 225 "Net-(BT3-Pad2)"))
+      (net 677 BAT4+))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11342,7 +11719,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D063473)
-    (at 253 138.7875 270)
+    (at 244 129.2875 270)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D0C30C5)
@@ -11369,7 +11746,7 @@
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 224 "Net-(BT2-Pad2)"))
+      (net 676 BAT3+))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11378,7 +11755,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D063462)
-    (at 275.5 138.5 270)
+    (at 269.5 128.5 270)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D0F86CA)
@@ -11405,7 +11782,7 @@
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 222 "Net-(BT1-Pad2)"))
+      (net 675 BAT2+))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11414,18 +11791,18 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D063451)
-    (at 299 138.5 270)
+    (at 279 129.5)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D090CB8)
     (attr smd)
-    (fp_text reference C8 (at 0 -1.43 90) (layer F.SilkS)
+    (fp_text reference C8 (at 0 -1.43) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100nF (at 0 1.43 90) (layer F.Fab)
+    (fp_text value 100nF (at 0 1.43) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
+    (fp_text user %R (at 0 0) (layer F.Fab)
       (effects (font (size 0.4 0.4) (thickness 0.06)))
     )
     (fp_line (start 1.48 0.73) (end -1.48 0.73) (layer F.CrtYd) (width 0.05))
@@ -11438,10 +11815,10 @@
     (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
-    (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
-    (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 223 "Net-(BT1-Pad1)"))
+    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
+      (net 674 BAT1+))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11450,7 +11827,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D063440)
-    (at 273 89.5 180)
+    (at 272.5 60.5 180)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D981F2B)
@@ -11477,7 +11854,7 @@
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11486,7 +11863,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D06342F)
-    (at 271 80.5)
+    (at 270.5 51.5)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D80897A)
@@ -11513,7 +11890,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 235 "Net-(C6-Pad1)"))
+      (net 227 "Net-(C6-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11522,7 +11899,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D06341E)
-    (at 245.5 100.5 180)
+    (at 232.5 99 180)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D24B4DD)
@@ -11549,7 +11926,7 @@
     (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 234 "/Reform 2 Power/VREG"))
+      (net 226 "/Reform 2 Power/VREG"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11558,7 +11935,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D06340D)
-    (at 249 100.5)
+    (at 236 99)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D24B7B3)
@@ -11585,7 +11962,7 @@
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 233 "Net-(C4-Pad1)"))
+      (net 225 "Net-(C4-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11594,7 +11971,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0633EB)
-    (at 243 113.5 270)
+    (at 230 112 270)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D3F0FA8)
@@ -11621,7 +11998,7 @@
     (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
       (net 40 GND))
     (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 232 "Net-(C2-Pad1)"))
+      (net 224 "Net-(C2-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11630,7 +12007,7 @@
   )
 
   (module Capacitor_SMD:C_0603_1608Metric (layer F.Cu) (tedit 5B301BBE) (tstamp 5D0633DA)
-    (at 278.5 115)
+    (at 253 105)
     (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
     (tags capacitor)
     (path /5CC81028/5D96B0D5)
@@ -11655,9 +12032,9 @@
     (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.1))
     (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
     (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 230 "Net-(C1-Pad2)"))
+      (net 222 "Net-(C1-Pad2)"))
     (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers F.Cu F.Paste F.Mask) (roundrect_rratio 0.25)
-      (net 231 "Net-(C1-Pad1)"))
+      (net 223 "Net-(C1-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11665,456 +12042,8 @@
     )
   )
 
-  (module Battery:BatteryHolder_Keystone_1042_1x18650 (layer F.Cu) (tedit 5A033499) (tstamp 5D0633C9)
-    (at 50.5 180 270)
-    (descr "Battery holder for 18650 cylindrical cells http://www.keyelco.com/product.cfm/product_id/918")
-    (tags "18650 Keystone 1042 Li-ion")
-    (path /5CC81028/5CC8EDE0)
-    (attr smd)
-    (fp_text reference BT8 (at 0 -11.5 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value Battery_Cell (at 0 11.3 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -42.5 -4.75) (end -42.5 -7.25) (layer F.SilkS) (width 0.12))
-    (fp_line (start -43.75 -6) (end -41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -39.03 3.68) (end -43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 3.68) (end -43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 -3.68) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 -3.68) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 3.68) (end 43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end -39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 -10.83) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end 39.03 -10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end 39.03 10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 38.53 -10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -33.3675 -10.33) (end 38.53 -10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 43.75 -6) (end 41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.53 -5.1675) (end -38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -38.53 10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 38.64 -3.44) (end 38.64 -10.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 -10.44) (end -38.64 -10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 -10.44) (end -38.64 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 3.44) (end 38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 10.44) (end -38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 10.44) (end -38.64 3.44) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 39.03 10.83) (end 39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 3.68) (end 43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -38.64 -3.44) (end -43 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -33.3675 -10.33) (end -38.53 -5.1675) (layer F.Fab) (width 0.1))
-    (pad "" np_thru_hole circle (at -35.93 -8 270) (size 2.39 2.39) (drill 2.39) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -27.6 8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 27.6 -8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad 2 smd rect (at 39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 40 GND))
-    (pad 1 smd rect (at -39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 229 "Net-(BT7-Pad2)"))
-    (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_1042_1x18650.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Battery:BatteryHolder_Keystone_1042_1x18650 (layer F.Cu) (tedit 5A033499) (tstamp 5D0633A4)
-    (at 73 180 270)
-    (descr "Battery holder for 18650 cylindrical cells http://www.keyelco.com/product.cfm/product_id/918")
-    (tags "18650 Keystone 1042 Li-ion")
-    (path /5CC81028/5CC8E8E5)
-    (attr smd)
-    (fp_text reference BT7 (at 0 -11.5 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value Battery_Cell (at 0 11.3 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -42.5 -4.75) (end -42.5 -7.25) (layer F.SilkS) (width 0.12))
-    (fp_line (start -43.75 -6) (end -41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -39.03 3.68) (end -43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 3.68) (end -43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 -3.68) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 -3.68) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 3.68) (end 43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end -39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 -10.83) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end 39.03 -10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end 39.03 10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 38.53 -10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -33.3675 -10.33) (end 38.53 -10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 43.75 -6) (end 41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.53 -5.1675) (end -38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -38.53 10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 38.64 -3.44) (end 38.64 -10.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 -10.44) (end -38.64 -10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 -10.44) (end -38.64 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 3.44) (end 38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 10.44) (end -38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 10.44) (end -38.64 3.44) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 39.03 10.83) (end 39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 3.68) (end 43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -38.64 -3.44) (end -43 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -33.3675 -10.33) (end -38.53 -5.1675) (layer F.Fab) (width 0.1))
-    (pad "" np_thru_hole circle (at -35.93 -8 270) (size 2.39 2.39) (drill 2.39) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -27.6 8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 27.6 -8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad 2 smd rect (at 39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 229 "Net-(BT7-Pad2)"))
-    (pad 1 smd rect (at -39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 228 "Net-(BT6-Pad2)"))
-    (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_1042_1x18650.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Battery:BatteryHolder_Keystone_1042_1x18650 (layer F.Cu) (tedit 5A033499) (tstamp 5D11E114)
-    (at 95.5 180 270)
-    (descr "Battery holder for 18650 cylindrical cells http://www.keyelco.com/product.cfm/product_id/918")
-    (tags "18650 Keystone 1042 Li-ion")
-    (path /5CC81028/5CC8446F)
-    (attr smd)
-    (fp_text reference BT6 (at 0 -11.5 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value Battery_Cell (at 0 11.3 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -42.5 -4.75) (end -42.5 -7.25) (layer F.SilkS) (width 0.12))
-    (fp_line (start -43.75 -6) (end -41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -39.03 3.68) (end -43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 3.68) (end -43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 -3.68) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 -3.68) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 3.68) (end 43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end -39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 -10.83) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end 39.03 -10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end 39.03 10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 38.53 -10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -33.3675 -10.33) (end 38.53 -10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 43.75 -6) (end 41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.53 -5.1675) (end -38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -38.53 10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 38.64 -3.44) (end 38.64 -10.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 -10.44) (end -38.64 -10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 -10.44) (end -38.64 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 3.44) (end 38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 10.44) (end -38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 10.44) (end -38.64 3.44) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 39.03 10.83) (end 39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 3.68) (end 43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -38.64 -3.44) (end -43 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -33.3675 -10.33) (end -38.53 -5.1675) (layer F.Fab) (width 0.1))
-    (pad "" np_thru_hole circle (at -35.93 -8 270) (size 2.39 2.39) (drill 2.39) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -27.6 8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 27.6 -8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad 2 smd rect (at 39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 228 "Net-(BT6-Pad2)"))
-    (pad 1 smd rect (at -39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 227 "Net-(BT5-Pad2)"))
-    (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_1042_1x18650.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Battery:BatteryHolder_Keystone_1042_1x18650 (layer F.Cu) (tedit 5A033499) (tstamp 5D11998C)
-    (at 118 180 270)
-    (descr "Battery holder for 18650 cylindrical cells http://www.keyelco.com/product.cfm/product_id/918")
-    (tags "18650 Keystone 1042 Li-ion")
-    (path /5CC81028/5CC83E05)
-    (attr smd)
-    (fp_text reference BT5 (at 0 -11.5 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value Battery_Cell (at 0 11.3 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -42.5 -4.75) (end -42.5 -7.25) (layer F.SilkS) (width 0.12))
-    (fp_line (start -43.75 -6) (end -41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -39.03 3.68) (end -43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 3.68) (end -43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 -3.68) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 -3.68) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 3.68) (end 43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end -39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 -10.83) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end 39.03 -10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end 39.03 10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 38.53 -10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -33.3675 -10.33) (end 38.53 -10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 43.75 -6) (end 41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.53 -5.1675) (end -38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -38.53 10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 38.64 -3.44) (end 38.64 -10.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 -10.44) (end -38.64 -10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 -10.44) (end -38.64 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 3.44) (end 38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 10.44) (end -38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 10.44) (end -38.64 3.44) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 39.03 10.83) (end 39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 3.68) (end 43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -38.64 -3.44) (end -43 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -33.3675 -10.33) (end -38.53 -5.1675) (layer F.Fab) (width 0.1))
-    (pad "" np_thru_hole circle (at -35.93 -8 270) (size 2.39 2.39) (drill 2.39) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -27.6 8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 27.6 -8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad 2 smd rect (at 39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 227 "Net-(BT5-Pad2)"))
-    (pad 1 smd rect (at -39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 226 "Net-(BT4-Pad2)"))
-    (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_1042_1x18650.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Battery:BatteryHolder_Keystone_1042_1x18650 (layer F.Cu) (tedit 5A033499) (tstamp 5D063335)
-    (at 237 180 270)
-    (descr "Battery holder for 18650 cylindrical cells http://www.keyelco.com/product.cfm/product_id/918")
-    (tags "18650 Keystone 1042 Li-ion")
-    (path /5CC81028/5CC90A08)
-    (attr smd)
-    (fp_text reference BT4 (at 0 -11.5 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value Battery_Cell (at 0 11.3 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -42.5 -4.75) (end -42.5 -7.25) (layer F.SilkS) (width 0.12))
-    (fp_line (start -43.75 -6) (end -41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -39.03 3.68) (end -43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 3.68) (end -43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 -3.68) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 -3.68) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 3.68) (end 43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end -39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 -10.83) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end 39.03 -10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end 39.03 10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 38.53 -10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -33.3675 -10.33) (end 38.53 -10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 43.75 -6) (end 41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.53 -5.1675) (end -38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -38.53 10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 38.64 -3.44) (end 38.64 -10.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 -10.44) (end -38.64 -10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 -10.44) (end -38.64 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 3.44) (end 38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 10.44) (end -38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 10.44) (end -38.64 3.44) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 39.03 10.83) (end 39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 3.68) (end 43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -38.64 -3.44) (end -43 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -33.3675 -10.33) (end -38.53 -5.1675) (layer F.Fab) (width 0.1))
-    (pad "" np_thru_hole circle (at -35.93 -8 270) (size 2.39 2.39) (drill 2.39) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -27.6 8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 27.6 -8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad 2 smd rect (at 39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 226 "Net-(BT4-Pad2)"))
-    (pad 1 smd rect (at -39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 225 "Net-(BT3-Pad2)"))
-    (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_1042_1x18650.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Battery:BatteryHolder_Keystone_1042_1x18650 (layer F.Cu) (tedit 5A033499) (tstamp 5D0F38BB)
-    (at 259.5 180 270)
-    (descr "Battery holder for 18650 cylindrical cells http://www.keyelco.com/product.cfm/product_id/918")
-    (tags "18650 Keystone 1042 Li-ion")
-    (path /5CC81028/5CC907EA)
-    (attr smd)
-    (fp_text reference BT3 (at 0 -11.5 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value Battery_Cell (at 0 11.3 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -42.5 -4.75) (end -42.5 -7.25) (layer F.SilkS) (width 0.12))
-    (fp_line (start -43.75 -6) (end -41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -39.03 3.68) (end -43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 3.68) (end -43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 -3.68) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 -3.68) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 3.68) (end 43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end -39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 -10.83) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end 39.03 -10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end 39.03 10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 38.53 -10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -33.3675 -10.33) (end 38.53 -10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 43.75 -6) (end 41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.53 -5.1675) (end -38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -38.53 10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 38.64 -3.44) (end 38.64 -10.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 -10.44) (end -38.64 -10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 -10.44) (end -38.64 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 3.44) (end 38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 10.44) (end -38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 10.44) (end -38.64 3.44) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 39.03 10.83) (end 39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 3.68) (end 43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -38.64 -3.44) (end -43 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -33.3675 -10.33) (end -38.53 -5.1675) (layer F.Fab) (width 0.1))
-    (pad "" np_thru_hole circle (at -35.93 -8 270) (size 2.39 2.39) (drill 2.39) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -27.6 8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 27.6 -8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad 2 smd rect (at 39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 225 "Net-(BT3-Pad2)"))
-    (pad 1 smd rect (at -39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 224 "Net-(BT2-Pad2)"))
-    (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_1042_1x18650.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Battery:BatteryHolder_Keystone_1042_1x18650 (layer F.Cu) (tedit 5A033499) (tstamp 5D0F384F)
-    (at 282 180 270)
-    (descr "Battery holder for 18650 cylindrical cells http://www.keyelco.com/product.cfm/product_id/918")
-    (tags "18650 Keystone 1042 Li-ion")
-    (path /5CC81028/5CC85454)
-    (attr smd)
-    (fp_text reference BT2 (at 0 -11.5 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value Battery_Cell (at 0 11.3 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -42.5 -4.75) (end -42.5 -7.25) (layer F.SilkS) (width 0.12))
-    (fp_line (start -43.75 -6) (end -41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -39.03 3.68) (end -43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 3.68) (end -43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 -3.68) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 -3.68) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 3.68) (end 43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end -39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 -10.83) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end 39.03 -10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end 39.03 10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 38.53 -10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -33.3675 -10.33) (end 38.53 -10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 43.75 -6) (end 41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.53 -5.1675) (end -38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -38.53 10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 38.64 -3.44) (end 38.64 -10.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 -10.44) (end -38.64 -10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 -10.44) (end -38.64 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 3.44) (end 38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 10.44) (end -38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 10.44) (end -38.64 3.44) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 39.03 10.83) (end 39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 3.68) (end 43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -38.64 -3.44) (end -43 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -33.3675 -10.33) (end -38.53 -5.1675) (layer F.Fab) (width 0.1))
-    (pad "" np_thru_hole circle (at -35.93 -8 270) (size 2.39 2.39) (drill 2.39) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -27.6 8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 27.6 -8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad 2 smd rect (at 39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 224 "Net-(BT2-Pad2)"))
-    (pad 1 smd rect (at -39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 222 "Net-(BT1-Pad2)"))
-    (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_1042_1x18650.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Battery:BatteryHolder_Keystone_1042_1x18650 (layer F.Cu) (tedit 5A033499) (tstamp 5D0F37E3)
-    (at 304.5 180 270)
-    (descr "Battery holder for 18650 cylindrical cells http://www.keyelco.com/product.cfm/product_id/918")
-    (tags "18650 Keystone 1042 Li-ion")
-    (path /5CC81028/5CC84A1C)
-    (attr smd)
-    (fp_text reference BT1 (at 0 -11.5 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value Battery_Cell (at 0 11.3 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -42.5 -4.75) (end -42.5 -7.25) (layer F.SilkS) (width 0.12))
-    (fp_line (start -43.75 -6) (end -41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -39.03 3.68) (end -43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 3.68) (end -43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -43.5 -3.68) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 -3.68) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 3.68) (end 43.5 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end -39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end -39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 39.03 -10.83) (end 39.03 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 -10.83) (end 39.03 -10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -39.03 10.83) (end 39.03 10.83) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 38.53 -10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -33.3675 -10.33) (end 38.53 -10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 43.75 -6) (end 41.25 -6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.53 -5.1675) (end -38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start -38.53 10.33) (end 38.53 10.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 38.64 -3.44) (end 38.64 -10.42) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 -10.44) (end -38.64 -10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 -10.44) (end -38.64 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 3.44) (end 38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start 38.64 10.44) (end -38.64 10.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -38.64 10.44) (end -38.64 3.44) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 0 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 39.03 10.83) (end 39.03 3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 43.5 3.68) (end 43.5 -3.68) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -38.64 -3.44) (end -43 -3.44) (layer F.SilkS) (width 0.12))
-    (fp_line (start -33.3675 -10.33) (end -38.53 -5.1675) (layer F.Fab) (width 0.1))
-    (pad "" np_thru_hole circle (at -35.93 -8 270) (size 2.39 2.39) (drill 2.39) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at -27.6 8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad "" np_thru_hole circle (at 27.6 -8 270) (size 3.45 3.45) (drill 3.45) (layers *.Cu *.Mask))
-    (pad 2 smd rect (at 39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 222 "Net-(BT1-Pad2)"))
-    (pad 1 smd rect (at -39.33 0 270) (size 7.34 6.35) (layers F.Cu F.Paste F.Mask)
-      (net 223 "Net-(BT1-Pad1)"))
-    (model ${KISYS3DMOD}/Battery.3dshapes/BatteryHolder_Keystone_1042_1x18650.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module reform2-motherboard:phycore-imx8m-alpha (layer F.Cu) (tedit 5CC20C1B) (tstamp 5D080C22)
-    (at 176 92.5 270)
+  (module reform2-motherboard:phycore-imx8m-alpha (layer F.Cu) (tedit 5CC20C1B) (tstamp 5D1E47EB)
+    (at 177.5 89 270)
     (path /5CC23859)
     (fp_text reference U1 (at 0 0.5 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -15033,41 +14962,41 @@
     (pad Z2 smd circle (at -28.64358 -18.25498 270) (size 1.67 1.67) (layers F.Cu F.Paste F.Mask))
     (pad Z4 smd rect (at 27.559 17.9451 270) (size 1.67 1.67) (layers F.Cu F.Paste F.Mask))
     (pad A132 smd circle (at -29.6545 15.81912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 329 DSI_D3_N))
+      (net 321 DSI_D3_N))
     (pad A131 smd circle (at -29.6545 14.54912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 330 DSI_D3_P))
+      (net 322 DSI_D3_P))
     (pad A130 smd circle (at -29.6545 13.27912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 331 DSI_D0_N))
+      (net 323 DSI_D0_N))
     (pad A129 smd circle (at -29.6545 12.00912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 332 DSI_D0_P))
+      (net 324 DSI_D0_P))
     (pad A128 smd circle (at -29.6545 10.73912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 333 DSI_CLK_N))
+      (net 325 DSI_CLK_N))
     (pad A127 smd circle (at -29.6545 9.46912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 334 DSI_CLK_P))
+      (net 326 DSI_CLK_P))
     (pad A126 smd circle (at -29.6545 8.19912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 335 DSI_D1_N))
+      (net 327 DSI_D1_N))
     (pad A125 smd circle (at -29.6545 6.92912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 336 DSI_D1_P))
+      (net 328 DSI_D1_P))
     (pad A124 smd circle (at -29.6545 5.65912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 337 DSI_D2_N))
+      (net 329 DSI_D2_N))
     (pad A123 smd circle (at -29.6545 4.38912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 338 DSI_D2_P))
+      (net 330 DSI_D2_P))
     (pad A122 smd circle (at -29.6545 3.11912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 489 PCIE1_CLK_N))
+      (net 481 PCIE1_CLK_N))
     (pad A121 smd circle (at -29.6545 1.84912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 490 PCIE1_CLK_P))
+      (net 482 PCIE1_CLK_P))
     (pad A120 smd circle (at -29.6545 0.57912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 491 PCIE2_CLK_N))
+      (net 483 PCIE2_CLK_N))
     (pad A119 smd circle (at -29.6545 -0.69088 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 492 PCIE2_CLK_P))
+      (net 484 PCIE2_CLK_P))
     (pad A118 smd circle (at -29.6545 -1.96088 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 493 PCIE2_RX_P))
+      (net 485 PCIE2_RX_P))
     (pad A117 smd circle (at -29.6545 -3.23088 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 494 PCIE2_RX_N))
+      (net 486 PCIE2_RX_N))
     (pad A116 smd circle (at -29.6545 -4.50088 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 495 PCIE2_TX_P))
+      (net 487 PCIE2_TX_P))
     (pad A115 smd circle (at -29.6545 -5.77088 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 496 PCIE2_TX_N))
+      (net 488 PCIE2_TX_N))
     (pad A114 smd circle (at -29.6545 -7.04088 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 15 "Net-(U1-PadA114)"))
     (pad A113 smd circle (at -29.6545 -8.31088 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
@@ -15077,11 +15006,11 @@
     (pad A111 smd circle (at -29.6545 -10.85088 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 18 "Net-(U1-PadA111)"))
     (pad A110 smd circle (at -29.6545 -12.12088 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 497 PCIE1_RX_P))
+      (net 489 PCIE1_RX_P))
     (pad A109 smd circle (at -29.6545 -13.39088 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 498 PCIE1_RX_N))
+      (net 490 PCIE1_RX_N))
     (pad A108 smd circle (at -29.6545 -14.66088 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 499 PCIE1_TX_P))
+      (net 491 PCIE1_TX_P))
     (pad C104 smd circle (at -24.5745 13.27912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 19 "Net-(U1-PadC104)"))
     (pad C103 smd circle (at -24.5745 12.00912 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
@@ -15171,7 +15100,7 @@
     (pad B54 smd circle (at -28.3845 -15.29588 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad A107 smd circle (at -29.6545 -15.93088 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 500 PCIE1_TX_N))
+      (net 492 PCIE1_TX_N))
     (pad D42 smd circle (at -23.30704 -12.74826 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 40 GND))
     (pad C83 smd circle (at -24.5745 -13.39088 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
@@ -15235,9 +15164,9 @@
     (pad C41 smd circle (at 23.69312 -4.4958 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 70 "Net-(U1-PadC41)"))
     (pad C40 smd circle (at 23.69312 -3.2258 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 339 UART1_TX))
+      (net 331 UART1_TX))
     (pad C39 smd circle (at 23.69312 -1.9558 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 340 UART1_RX))
+      (net 332 UART1_RX))
     (pad C38 smd circle (at 23.69312 -0.6858 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 71 "Net-(U1-PadC38)"))
     (pad C37 smd circle (at 23.69312 0.5842 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
@@ -15701,9 +15630,9 @@
     (pad A97 smd circle (at -15.04696 -19.10334 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 189 "Net-(U1-PadA97)"))
     (pad A96 smd circle (at -13.77696 -19.10334 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 486 EDP_SCL))
+      (net 478 EDP_SCL))
     (pad A95 smd circle (at -12.50696 -19.10334 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 488 EDP_SDA))
+      (net 480 EDP_SDA))
     (pad A94 smd circle (at -11.23696 -19.10334 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 190 "Net-(U1-PadA94)"))
     (pad A93 smd circle (at -9.96696 -19.10334 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
@@ -15757,13 +15686,13 @@
     (pad A69 smd circle (at 20.51304 -19.10334 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 215 "Net-(U1-PadA69)"))
     (pad A68 smd circle (at 21.78304 -19.10334 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad A67 smd circle (at 23.05304 -19.10334 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad A66 smd circle (at 24.32304 -19.10334 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad A65 smd circle (at 25.59304 -19.10334 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 236 +3V3))
+      (net 228 +3V3))
     (pad A42 smd circle (at 25.595 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 1 HDMI_D2+))
     (pad A41 smd circle (at 24.325 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
@@ -15785,29 +15714,29 @@
     (pad A33 smd circle (at 14.165 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 217 "Net-(U1-PadA33)"))
     (pad A32 smd circle (at 12.895 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 599 USB2_RX_N))
+      (net 591 USB2_RX_N))
     (pad A31 smd circle (at 11.625 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 600 USB2_RX_P))
+      (net 592 USB2_RX_P))
     (pad A30 smd circle (at 10.355 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 601 USB2_TX_N))
+      (net 593 USB2_TX_N))
     (pad A29 smd circle (at 9.085 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 602 USB2_TX_P))
+      (net 594 USB2_TX_P))
     (pad A28 smd circle (at 7.815 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 603 USB2_DN))
+      (net 595 USB2_DN))
     (pad A27 smd circle (at 6.545 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 604 USB2_DP))
+      (net 596 USB2_DP))
     (pad A26 smd circle (at 5.275 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 341 USB1_RX_N))
+      (net 333 USB1_RX_N))
     (pad A25 smd circle (at 4.005 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 342 USB1_RX_P))
+      (net 334 USB1_RX_P))
     (pad A24 smd circle (at 2.735 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 343 USB1_TX_N))
+      (net 335 USB1_TX_N))
     (pad A23 smd circle (at 1.465 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 344 USB1_TX_P))
+      (net 336 USB1_TX_P))
     (pad A22 smd circle (at 0.195 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 345 USB1_DN))
+      (net 337 USB1_DN))
     (pad A21 smd circle (at -1.075 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 346 USB1_DP))
+      (net 338 USB1_DP))
     (pad A20 smd circle (at -2.345 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 14 SD2_DATA2))
     (pad A19 smd circle (at -3.615 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
@@ -15829,42 +15758,93 @@
     (pad A11 smd circle (at -13.775 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
       (net 221 "Net-(U1-PadA11)"))
     (pad A10 smd circle (at -15.045 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 296 ETH0_D-))
+      (net 288 ETH0_D-))
     (pad A9 smd circle (at -16.315 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 297 ETH0_D+))
+      (net 289 ETH0_D+))
     (pad A8 smd circle (at -17.585 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 300 ETH0_C-))
+      (net 292 ETH0_C-))
     (pad A7 smd circle (at -18.855 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 299 ETH0_C+))
+      (net 291 ETH0_C+))
     (pad A6 smd circle (at -20.125 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 301 ETH0_B-))
+      (net 293 ETH0_B-))
     (pad A5 smd circle (at -21.395 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 298 ETH0_B+))
+      (net 290 ETH0_B+))
     (pad A4 smd circle (at -22.665 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 294 ETH0_A-))
+      (net 286 ETH0_A-))
     (pad A3 smd circle (at -23.935 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 295 ETH0_A+))
+      (net 287 ETH0_A+))
     (pad A2 smd circle (at -25.205 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 304 ETH0_LED_LINK))
+      (net 296 ETH0_LED_LINK))
     (pad A1 smd circle (at -26.475 19 270) (size 0.5 0.5) (layers F.Cu F.Paste F.Mask)
-      (net 302 ETH0_LED_RX))
+      (net 294 ETH0_LED_RX))
+    (model ${KIPRJMOD}/3d-models/phycore-1497-1.step
+      (offset (xyz -31.5 -21 1.5))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
   )
 
+  (dimension 3.02 (width 0.12) (layer F.SilkS)
+    (gr_text "3.020 mm" (at 36.09 131.99 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (feature1 (pts (xy 41.96 130.48) (xy 36.773579 130.48)))
+    (feature2 (pts (xy 41.96 133.5) (xy 36.773579 133.5)))
+    (crossbar (pts (xy 37.36 133.5) (xy 37.36 130.48)))
+    (arrow1a (pts (xy 37.36 130.48) (xy 37.946421 131.606504)))
+    (arrow1b (pts (xy 37.36 130.48) (xy 36.773579 131.606504)))
+    (arrow2a (pts (xy 37.36 133.5) (xy 37.946421 132.373496)))
+    (arrow2b (pts (xy 37.36 133.5) (xy 36.773579 132.373496)))
+  )
+  (dimension 1.96 (width 0.12) (layer F.SilkS)
+    (gr_text "1.960 mm" (at 314.52 36.59) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (feature1 (pts (xy 313.54 43.78) (xy 313.54 37.273579)))
+    (feature2 (pts (xy 315.5 43.78) (xy 315.5 37.273579)))
+    (crossbar (pts (xy 315.5 37.86) (xy 313.54 37.86)))
+    (arrow1a (pts (xy 313.54 37.86) (xy 314.666504 37.273579)))
+    (arrow1b (pts (xy 313.54 37.86) (xy 314.666504 38.446421)))
+    (arrow2a (pts (xy 315.5 37.86) (xy 314.373496 37.273579)))
+    (arrow2b (pts (xy 315.5 37.86) (xy 314.373496 38.446421)))
+  )
+  (dimension 2.54 (width 0.12) (layer F.SilkS)
+    (gr_text "2.540 mm" (at 40.78 35.74) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (feature1 (pts (xy 42.05 43.95) (xy 42.05 36.423579)))
+    (feature2 (pts (xy 39.51 43.95) (xy 39.51 36.423579)))
+    (crossbar (pts (xy 39.51 37.01) (xy 42.05 37.01)))
+    (arrow1a (pts (xy 42.05 37.01) (xy 40.923496 37.596421)))
+    (arrow1b (pts (xy 42.05 37.01) (xy 40.923496 36.423579)))
+    (arrow2a (pts (xy 39.51 37.01) (xy 40.636504 37.596421)))
+    (arrow2b (pts (xy 39.51 37.01) (xy 40.636504 36.423579)))
+  )
+  (dimension 3.96 (width 0.12) (layer F.SilkS)
+    (gr_text "3.960 mm" (at 34.53 41.97 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (feature1 (pts (xy 47.48 43.95) (xy 35.213579 43.95)))
+    (feature2 (pts (xy 47.48 39.99) (xy 35.213579 39.99)))
+    (crossbar (pts (xy 35.8 39.99) (xy 35.8 43.95)))
+    (arrow1a (pts (xy 35.8 43.95) (xy 35.213579 42.823496)))
+    (arrow1b (pts (xy 35.8 43.95) (xy 36.386421 42.823496)))
+    (arrow2a (pts (xy 35.8 39.99) (xy 35.213579 41.116504)))
+    (arrow2b (pts (xy 35.8 39.99) (xy 36.386421 41.116504)))
+  )
+  (gr_line (start 315.5 133) (end 315 133.5) (layer Edge.Cuts) (width 0.05) (tstamp 5D1DF646))
+  (gr_line (start 315.5 41) (end 315.5 133) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 40 133.5) (end 39.5 133) (layer Edge.Cuts) (width 0.05) (tstamp 5D1DECCD))
+  (gr_line (start 186 107.5) (end 169 107.5) (layer Edge.Cuts) (width 0.05) (tstamp 5D1A796D))
+  (gr_line (start 186 76.5) (end 186 107.5) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 169 76.5) (end 186 76.5) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 169 107.5) (end 169 76.5) (layer Edge.Cuts) (width 0.05))
+  (gr_text "Speaker Cable" (at 279.5 42.5) (layer Dwgs.User)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
   (gr_line (start 40.5 40) (end 39.5 41) (layer Edge.Cuts) (width 0.05) (tstamp 5D13D364))
-  (gr_line (start 314.5 40) (end 315.5 41) (layer Edge.Cuts) (width 0.05) (tstamp 5D13D35B))
-  (gr_line (start 130 133.5) (end 129 134.5) (layer Edge.Cuts) (width 0.05) (tstamp 5D13D355))
-  (gr_line (start 225 133.5) (end 226 134.5) (layer Edge.Cuts) (width 0.05) (tstamp 5D13D34D))
-  (gr_line (start 315.5 222.5) (end 314.5 223.5) (layer Edge.Cuts) (width 0.05) (tstamp 5D13D344))
-  (gr_line (start 227 223.5) (end 226 222.5) (layer Edge.Cuts) (width 0.05) (tstamp 5D13D339))
-  (gr_line (start 128 223.5) (end 129 222.5) (layer Edge.Cuts) (width 0.05) (tstamp 5D13D330))
-  (gr_line (start 40.5 223.5) (end 39.5 222.5) (layer Edge.Cuts) (width 0.05) (tstamp 5D13D329))
-  (gr_line (start 39.5 222.5) (end 39.5 135) (layer Edge.Cuts) (width 0.05) (tstamp 5D1248E1))
-  (gr_line (start 128 223.5) (end 40.5 223.5) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 129 134.5) (end 129 222.5) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 225 133.5) (end 130 133.5) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 226 222.5) (end 226 134.5) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 314.5 223.5) (end 227 223.5) (layer Edge.Cuts) (width 0.05))
-  (gr_line (start 315.5 135) (end 315.5 222.5) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 314.5 40) (end 315.5 41) (layer Edge.Cuts) (width 0.05) (tstamp 5D1EC513))
+  (gr_line (start 315 133.5) (end 40 133.5) (layer Edge.Cuts) (width 0.05) (tstamp 5D1D07B8))
   (dimension 138 (width 0.12) (layer F.SilkS)
     (gr_text "138.000 mm" (at 108.5 22.730001) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -15901,8 +15881,7 @@
     (arrow2a (pts (xy 39.5 32) (xy 40.626504 32.586421)))
     (arrow2b (pts (xy 39.5 32) (xy 40.626504 31.413579)))
   )
-  (gr_line (start 39.5 135) (end 39.5 41) (layer Edge.Cuts) (width 0.05) (tstamp 5D084776))
-  (gr_line (start 315.5 41) (end 315.5 135) (layer Edge.Cuts) (width 0.05))
+  (gr_line (start 39.5 133) (end 39.5 41) (layer Edge.Cuts) (width 0.05) (tstamp 5D1DDA4F))
   (gr_line (start 40.5 40) (end 314.5 40) (layer Edge.Cuts) (width 0.05) (tstamp 5CC9DF40))
 
 )

	reform MNT Reform: Open Source Portable Computer
	Log (Feed) \| Files \| Refs (Tags) \| README