diff --git a/hardware/usb_cable_tester.lht b/hardware/usb_cable_tester.lht
index e7502c0..127fcfa 100644
--- a/hardware/usb_cable_tester.lht
+++ b/hardware/usb_cable_tester.lht
@@ -1537,13 +1537,13 @@ ha:pcb-rnd-board-v6 {
            x1=32.4mm; y1=10.8mm; x2=30.8mm; y2=10.8mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.77 {
-           string=CAPC1608X92M; x=31.6mm; y=11.2mm; scale=53; fid=0;
+           string=100nF; x=27.7mm; y=11.6mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 180.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -2000,13 +2000,13 @@ ha:pcb-rnd-board-v6 {
            x1=33.7mm; y1=37.5mm; x2=33.7mm; y2=39.1mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.142 {
-           string=CAPC1608X92M; x=34.1mm; y=38.3mm; scale=53; fid=0;
+           string=100nF; x=33.1mm; y=36.6mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 90.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -2463,13 +2463,13 @@ ha:pcb-rnd-board-v6 {
            x1=28.8mm; y1=23.8mm; x2=27.2mm; y2=23.8mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.207 {
-           string=CAPC1608X92M; x=28.0mm; y=24.2mm; scale=53; fid=0;
+           string=100nF; x=27.1mm; y=23.2mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 180.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -2929,7 +2929,7 @@ ha:pcb-rnd-board-v6 {
            x1=56.8mm; y1=20.6mm; x2=58.4mm; y2=20.6mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.272 {
-           string=CAPC1608X92M; x=57.6mm; y=20.2mm; scale=53; fid=0;
+           string=100nF; x=56.7mm; y=19.1mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
@@ -3392,7 +3392,7 @@ ha:pcb-rnd-board-v6 {
            x1=56.8mm; y1=32.6mm; x2=58.4mm; y2=32.6mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.337 {
-           string=CAPC1608X92M; x=57.6mm; y=32.2mm; scale=53; fid=0;
+           string=100nF; x=56.6mm; y=31.1mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
@@ -3855,13 +3855,13 @@ ha:pcb-rnd-board-v6 {
            x1=45.2mm; y1=37.5mm; x2=45.2mm; y2=39.1mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.402 {
-           string=CAPC1608X92M; x=45.6mm; y=38.3mm; scale=53; fid=0;
+           string=100nF; x=44.6mm; y=36.6mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 90.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -4318,13 +4318,13 @@ ha:pcb-rnd-board-v6 {
            x1=42.0mm; y1=9.4mm; x2=42.0mm; y2=7.8mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.467 {
-           string=CAPC1608X92M; x=41.6mm; y=8.6mm; scale=53; fid=0;
+           string=100nF; x=40.7mm; y=11.0mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 270.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -4781,13 +4781,13 @@ ha:pcb-rnd-board-v6 {
            x1=40.2mm; y1=37.5mm; x2=40.2mm; y2=39.1mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.691 {
-           string=CAPC1608X92M; x=40.6mm; y=38.3mm; scale=53; fid=0;
+           string=100nF; x=39.7mm; y=36.6mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 90.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -5244,13 +5244,13 @@ ha:pcb-rnd-board-v6 {
            x1=28.7mm; y1=16.7mm; x2=27.1mm; y2=16.7mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.756 {
-           string=CAPC1608X92M; x=27.9mm; y=17.1mm; scale=53; fid=0;
+           string=100nF; x=27.0mm; y=19.0mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 180.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -5712,7 +5712,7 @@ ha:pcb-rnd-board-v6 {
            x1=33.7mm; y1=23.4mm; x2=35.3mm; y2=23.4mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.821 {
-           string=CAPC1608X92M; x=34.5mm; y=23.8mm; scale=53; fid=0;
+           string=20pF; x=31.0mm; y=23.1mm; scale=53; fid=0;
            ha:flags {
             floater=1
             clearline=1
@@ -6179,12 +6179,12 @@ ha:pcb-rnd-board-v6 {
            x1=43.7mm; y1=24.2mm; x2=42.1mm; y2=24.2mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.886 {
-           string=CAPC1608X92M; x=42.9mm; y=23.8mm; scale=53; fid=0;
+           string=20pF; x=44.7mm; y=23.1mm; scale=53; fid=0;
            ha:flags {
             floater=1
             clearline=1
            }
-           rot = 180.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -6645,13 +6645,13 @@ ha:pcb-rnd-board-v6 {
            x1=88.8mm; y1=3.6mm; x2=88.8mm; y2=5.2mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.951 {
-           string=CAPC1608X92M; x=89.2mm; y=4.4mm; scale=53; fid=0;
+           string=1uF; x=88.7mm; y=2.7mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 90.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -7108,13 +7108,13 @@ ha:pcb-rnd-board-v6 {
            x1=83.0mm; y1=6.6mm; x2=83.0mm; y2=5.0mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.1016 {
-           string=CAPC1608X92M; x=3.2519685in; y=5.8mm; scale=53; fid=0;
+           string=1uF; x=82.1mm; y=4.1mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 270.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -7577,7 +7577,7 @@ ha:pcb-rnd-board-v6 {
            x1=75.0mm; y1=20.0mm; x2=76.6mm; y2=20.0mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.1146 {
-           string=CAPC1608X92M; x=75.8mm; y=19.6mm; scale=53; fid=0;
+           string=1uF; x=75.3mm; y=18.5mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
@@ -8048,15 +8048,7 @@ ha:pcb-rnd-board-v6 {
            x1=60.4mm; y1=27.2mm; x2=60.8mm; y2=27.6mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.1224 {
-           string=LEDC1608X90M; x=60.0mm; y=27.6mm; scale=53; fid=0;
-           ha:flags {
-            floater=1
-            clearline=1
-           }
-           rot = 360.000000
-          }
-          ha:text.1225 {
-           string=LEDC1608X90M; x=60.0mm; y=27.6mm; scale=53; fid=0;
+           string=LED; x=57.6mm; y=25.8mm; scale=53; fid=0;
            ha:flags {
             floater=1
             clearline=1
@@ -8518,13 +8510,13 @@ ha:pcb-rnd-board-v6 {
            x1=84.2mm; y1=29.3mm; x2=3.2519685in; y2=29.3mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.1290 {
-           string=CAPC1608X92M; x=83.4mm; y=29.7mm; scale=53; fid=0;
+           string=1uF; x=82.8mm; y=28.6mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 180.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -8914,19 +8906,22 @@ ha:pcb-rnd-board-v6 {
            ha:attributes {
              subc-role=origin
            }
-          }
+ ha:flags ={ selected=1
+ };          }
           ha:line.1330 {
            x1=29.9mm; y1=45.9mm; x2=30.9mm; y2=45.9mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=x
            }
-          }
+ ha:flags ={ selected=1
+ };          }
           ha:line.1333 {
            x1=29.9mm; y1=45.9mm; x2=29.9mm; y2=44.9mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=y
            }
-          }
+ ha:flags ={ selected=1
+ };          }
          }
          ha:type {
           misc = 1
@@ -8981,13 +8976,13 @@ ha:pcb-rnd-board-v6 {
            x1=29.5mm; y1=45.1mm; x2=29.5mm; y2=46.7mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.1355 {
-           string=CAPC1608X92M; x=29.9mm; y=45.9mm; scale=53; fid=0;
+           string=1uF; x=29.4mm; y=44.2mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 90.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -9444,13 +9439,13 @@ ha:pcb-rnd-board-v6 {
            x1=28.65mm; y1=14.7mm; x2=27.05mm; y2=14.7mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.1420 {
-           string=CAPC1608X92M; x=27.85mm; y=15.1mm; scale=53; fid=0;
+           string=100nF; x=26.95mm; y=14.0mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 180.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -9834,22 +9829,19 @@ ha:pcb-rnd-board-v6 {
            ha:attributes {
              subc-role=origin
            }
- ha:flags ={ selected=1
- };          }
+          }
           ha:line.1460 {
            x1=60.0mm; y1=31.0mm; x2=60.0mm; y2=32.0mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=x
            }
- ha:flags ={ selected=1
- };          }
+          }
           ha:line.1463 {
            x1=60.0mm; y1=31.0mm; x2=59.0mm; y2=31.0mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=y
            }
- ha:flags ={ selected=1
- };          }
+          }
          }
          ha:type {
           top = 1
@@ -9918,15 +9910,7 @@ ha:pcb-rnd-board-v6 {
            x1=60.4mm; y1=30.6mm; x2=60.8mm; y2=31.0mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.1498 {
-           string=LEDC1608X90M; x=60.0mm; y=31.0mm; scale=53; fid=0;
-           ha:flags {
-            floater=1
-            clearline=1
-           }
-           rot = 360.000000
-          }
-          ha:text.1499 {
-           string=LEDC1608X90M; x=60.0mm; y=31.0mm; scale=53; fid=0;
+           string=LED; x=57.6mm; y=29.2mm; scale=53; fid=0;
            ha:flags {
             floater=1
             clearline=1
@@ -10401,15 +10385,7 @@ ha:pcb-rnd-board-v6 {
            x1=60.4mm; y1=23.8mm; x2=60.8mm; y2=24.2mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.1577 {
-           string=LEDC1608X90M; x=60.0mm; y=24.2mm; scale=53; fid=0;
-           ha:flags {
-            floater=1
-            clearline=1
-           }
-           rot = 360.000000
-          }
-          ha:text.1578 {
-           string=LEDC1608X90M; x=60.0mm; y=24.2mm; scale=53; fid=0;
+           string=LED; x=57.6mm; y=22.3mm; scale=53; fid=0;
            ha:flags {
             floater=1
             clearline=1
@@ -10871,13 +10847,13 @@ ha:pcb-rnd-board-v6 {
            x1=52.0mm; y1=9.4mm; x2=52.0mm; y2=7.8mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.1643 {
-           string=CAPC1608X92M; x=51.6mm; y=8.6mm; scale=53; fid=0;
+           string=100nF; x=50.7mm; y=11.1mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 270.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -11334,7 +11310,7 @@ ha:pcb-rnd-board-v6 {
            x1=56.8mm; y1=26.1mm; x2=58.4mm; y2=26.1mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.1708 {
-           string=CAPC1608X92M; x=57.6mm; y=25.7mm; scale=53; fid=0;
+           string=100nF; x=56.7mm; y=24.6mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
@@ -11823,13 +11799,13 @@ ha:pcb-rnd-board-v6 {
            x1=72.79mm; y1=6.65mm; x2=72.14mm; y2=287.4015748mil; thickness=0.1mm; clearance=0.0;
           }
           ha:text.2652 {
-           string=SOT95P237X112-3M; x=73.6mm; y=287.4015748mil; scale=86; fid=0;
+           string=pMOS; x=75.9mm; y=8.2mm; scale=86; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 180.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -12292,7 +12268,7 @@ ha:pcb-rnd-board-v6 {
            x1=27.15mm; y1=20.6mm; x2=28.75mm; y2=20.6mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.2925 {
-           string=RESC1608X55M; x=1.1003937in; y=20.2mm; scale=53; fid=0;
+           string=10k; x=27.5mm; y=22.0mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
@@ -12754,13 +12730,13 @@ ha:pcb-rnd-board-v6 {
            x1=74.4mm; y1=3.1mm; x2=72.8mm; y2=3.1mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.2990 {
-           string=RESC1608X55M; x=73.6mm; y=3.5mm; scale=53; fid=0;
+           string=10k; x=75.2mm; y=3.9mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 180.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -13211,13 +13187,13 @@ ha:pcb-rnd-board-v6 {
            x1=73.25mm; y1=10.9mm; x2=73.25mm; y2=12.5mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.3055 {
-           string=RESC1608X55M; x=73.65mm; y=11.7mm; scale=53; fid=0;
+           string=1k5; x=75.0mm; y=12.15mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 90.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -13668,13 +13644,13 @@ ha:pcb-rnd-board-v6 {
            x1=85.7mm; y1=21.6mm; x2=85.7mm; y2=23.2mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.3120 {
-           string=RESC1608X55M; x=86.1mm; y=22.4mm; scale=53; fid=0;
+           string=1k5; x=87.3mm; y=23.5mm; scale=53; fid=0;
            ha:flags {
             floater=1
             onsolder=1
             clearline=1
            }
-           rot = 90.000000
+           rot = 360.000000
           }
          }
          ha:type {
@@ -13963,7 +13939,7 @@ ha:pcb-rnd-board-v6 {
            x1=91.75mm; y1=98.75mm; x2=91.75mm; y2=92.75mm; thickness=0.1mm; clearance=0.0;
           }
           ha:text.3321 {
-           string=custom_BUTTON6MM; x=94.75mm; y=95.75mm; scale=100; fid=0;
+           string=BUTTON6MM; x=90.75mm; y=90.65mm; scale=100; fid=0;
            ha:flags {
             floater=1
             clearline=1
@@ -14737,7 +14713,7 @@ ha:pcb-rnd-board-v6 {
             x1=86.425mm; y1=5.925mm; x2=87.25mm; y2=5.1mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.3789 {
-            string=SOT95P280X130-3M; x=85.8mm; y=5.1mm; scale=100; fid=0;
+            string=LDO; x=84.7mm; y=2.5mm; scale=100; fid=0;
             ha:flags {
              clearline=1
              floater=1
@@ -15198,22 +15174,19 @@ ha:pcb-rnd-board-v6 {
             ha:attributes {
               subc-role=origin
             }
- ha:flags ={ selected=1
- };           }
+           }
            ha:line.4317 {
             x1=46.45mm; y1=43.4mm; x2=45.45mm; y2=43.4mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
- ha:flags ={ selected=1
- };           }
+           }
            ha:line.4320 {
             x1=46.45mm; y1=43.4mm; x2=46.45mm; y2=42.4mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
- ha:flags ={ selected=1
- };           }
+           }
           }
           ha:type {
            top = 1
@@ -15273,12 +15246,12 @@ ha:pcb-rnd-board-v6 {
             x1=67.45mm; y1=33.9mm; x2=67.45mm; y2=52.9mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.4348 {
-            string=custom_I2C_LCD_ADAPTER; x=46.45mm; y=43.4mm; scale=100; fid=0;
+            string=I2C_LCM1602_ADAPTER; x=1.5019685in; y=44.3mm; scale=100; fid=0;
             ha:flags {
              clearline=1
              floater=1
             }
-            rot = 180.000000
+            rot = 360.000000
            }
           }
           ha:type {
@@ -15672,7 +15645,7 @@ ha:pcb-rnd-board-v6 {
             x1=10.365531mm; y1=82.581554mm; x2=0.510531mm; y2=82.581554mm; thickness=0.12mm; clearance=0.0;
            }
            ha:text.9368 {
-            string=%a.parent.refdes%; x=16.481554mm; y=3.15667201in; scale=100; fid=0;
+            string=%a.parent.refdes%; x=18.381554mm; y=96.879469mm; scale=100; fid=0;
             ha:flags {
              clearline=1
              dyntext=1
@@ -15705,7 +15678,7 @@ ha:pcb-rnd-board-v6 {
             x1=0.570531mm; y1=82.641554mm; x2=17.270531mm; y2=82.641554mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.9381 {
-            string=custom_FCI_10117835; x=8.920531mm; y=90.581554mm; scale=100; fid=0;
+            string=USB-A; x=6.620531mm; y=87.981554mm; scale=100; fid=0;
             ha:flags {
              clearline=1
              floater=1
@@ -16433,12 +16406,12 @@ ha:pcb-rnd-board-v6 {
             x1=0.47mm; y1=50.31mm; x2=17.17mm; y2=50.31mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.9650 {
-            string=custom_FCI_10117835; x=8.82mm; y=58.25mm; scale=100; fid=0;
+            string=USB-A; x=6.87mm; y=55.69mm; scale=100; fid=0;
             ha:flags {
              clearline=1
              floater=1
             }
-            rot = 0.000000
+            rot = 360.000000
            }
           }
           ha:type {
@@ -17362,7 +17335,7 @@ ha:pcb-rnd-board-v6 {
             x1=0.55mm; y1=62.0mm; x2=9.75mm; y2=62.0mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.9804 {
-            string=custom_USB_MINI-B; x=5.15mm; y=58.25mm; scale=100; fid=0;
+            string=USB_miniB; x=2.05mm; y=58.1mm; scale=100; fid=0;
             ha:flags {
              clearline=1
              floater=1
@@ -18643,12 +18616,12 @@ ha:pcb-rnd-board-v6 {
             x1=0.6mm; y1=1.825mm; x2=5.6mm; y2=1.825mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.9887 {
-            string=custom_GCT_USB3110; x=3.1mm; y=8.25mm; scale=100; fid=0;
+            string=USB-microB; x=6.725mm; y=12.175mm; scale=100; fid=0;
             ha:flags {
              clearline=1
              floater=1
             }
-            rot = 270.000000
+            rot = 90.000000
            }
           }
           ha:type {
@@ -19122,12 +19095,12 @@ ha:pcb-rnd-board-v6 {
             x1=0.45mm; y1=33.5mm; x2=18.8mm; y2=33.5mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.10452 {
-            string=custom_USB-B-3; x=9.625mm; y=39.5mm; scale=100; fid=0;
+            string=USB-B; x=7.325mm; y=37.0mm; scale=100; fid=0;
             ha:flags {
              clearline=1
              floater=1
             }
-            rot = 0.000000
+            rot = 360.000000
            }
           }
           ha:type {
@@ -19572,13 +19545,13 @@ ha:pcb-rnd-board-v6 {
             x1=67.9mm; y1=26.3mm; x2=67.9mm; y2=24.7mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.11055 {
-            string=RESC1608X55M; x=67.5mm; y=25.5mm; scale=53; fid=0;
+            string=22R; x=66.8mm; y=24.2mm; scale=53; fid=0;
             ha:flags {
              clearline=1
              floater=1
              onsolder=1
             }
-            rot = 270.000000
+            rot = 360.000000
            }
           }
           ha:type {
@@ -20035,13 +20008,13 @@ ha:pcb-rnd-board-v6 {
             x1=68.9mm; y1=21.6mm; x2=67.3mm; y2=21.6mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.11119 {
-            string=RESC1608X55M; x=68.1mm; y=22.0mm; scale=53; fid=0;
+            string=1k5; x=69.7mm; y=22.4mm; scale=53; fid=0;
             ha:flags {
              clearline=1
              floater=1
              onsolder=1
             }
-            rot = 180.000000
+            rot = 360.000000
            }
           }
           ha:type {
@@ -20808,12 +20781,12 @@ ha:pcb-rnd-board-v6 {
             x1=99.436751mm; y1=24.290663mm; x2=92.836751mm; y2=24.290663mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.11344 {
-            string=custom_USB_2_MICRO-B; x=96.136751mm; y=798.845mil; scale=100; fid=0;
+            string=USB-PC; x=93.209337mm; y=18.636751mm; scale=100; fid=0;
             ha:flags {
              clearline=1
              floater=1
             }
-            rot = 90.000000
+            rot = 360.000000
            }
           }
           ha:type {
@@ -21258,13 +21231,13 @@ ha:pcb-rnd-board-v6 {
             x1=65.8mm; y1=26.3mm; x2=65.8mm; y2=24.7mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.11405 {
-            string=RESC1608X55M; x=65.4mm; y=25.5mm; scale=53; fid=0;
+            string=22R; x=64.7mm; y=24.2mm; scale=53; fid=0;
             ha:flags {
              clearline=1
              floater=1
              onsolder=1
             }
-            rot = 270.000000
+            rot = 360.000000
            }
           }
           ha:type {
@@ -22248,13 +22221,13 @@ ha:pcb-rnd-board-v6 {
             x1=0.65mm; y1=44.65mm; x2=8.85mm; y2=44.65mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.16727 {
-            string=custom_LIGHTNING_IPHONE5; x=4.75mm; y=39.5mm; scale=100; fid=0;
+            string=lightning; x=2.0mm; y=42.25mm; scale=100; fid=0;
             ha:flags {
              clearline=1
              floater=1
              onsolder=1
             }
-            rot = 270.000000
+            rot = 360.000000
            }
           }
           ha:type {
@@ -22717,13 +22690,13 @@ ha:pcb-rnd-board-v6 {
             x1=89.1mm; y1=20.3mm; x2=89.1mm; y2=18.7mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.30729 {
-            string=CAPC1608X92M; x=88.7mm; y=19.5mm; scale=53; fid=0;
+            string=1uF; x=89.9mm; y=19.9mm; scale=53; fid=0;
             ha:flags {
              clearline=1
              floater=1
              onsolder=1
             }
-            rot = 270.000000
+            rot = 360.000000
            }
           }
           ha:type {
@@ -23605,13 +23578,13 @@ ha:pcb-rnd-board-v6 {
             x1=85.25mm; y1=16.45mm; x2=84.25mm; y2=15.45mm; thickness=0.1mm; clearance=0.0;
            }
            ha:text.30646 {
-            string=SOP113P600X175-9M; x=83.3mm; y=17.9mm; scale=100; fid=0;
+            string=TP4056; x=80.9mm; y=15.0mm; scale=100; fid=0;
             ha:flags {
              clearline=1
              floater=1
              onsolder=1
             }
-            rot = 270.000000
+            rot = 360.000000
            }
           }
           ha:type {
@@ -24629,19 +24602,22 @@ ha:pcb-rnd-board-v6 {
              ha:attributes {
                subc-role=origin
              }
-            }
+ ha:flags ={ selected=1
+ };            }
             ha:line.32103 {
              x1=8.7mm; y1=23.5mm; x2=8.7mm; y2=24.5mm; thickness=0.1mm; clearance=0.0;
              ha:attributes {
                subc-role=x
              }
-            }
+ ha:flags ={ selected=1
+ };            }
             ha:line.32106 {
              x1=8.7mm; y1=23.5mm; x2=7.7mm; y2=23.5mm; thickness=0.1mm; clearance=0.0;
              ha:attributes {
                subc-role=y
              }
-            }
+ ha:flags ={ selected=1
+ };            }
            }
            ha:type {
             top = 1
@@ -24680,7 +24656,7 @@ ha:pcb-rnd-board-v6 {
              x1=2.05mm; y1=18.515mm; x2=0.47mm; y2=18.515mm; thickness=0.12mm; clearance=0.0;
             }
             ha:text.32133 {
-             string=%a.parent.refdes%; x=8.8mm; y=16.035mm; scale=100; fid=0;
+             string=%a.parent.refdes%; x=11.4mm; y=26.835mm; scale=100; fid=0;
              ha:flags {
               dyntext=1
               floater=1
@@ -24712,7 +24688,7 @@ ha:pcb-rnd-board-v6 {
              x1=0.53mm; y1=18.575mm; x2=10.4mm; y2=18.575mm; thickness=0.1mm; clearance=0.0;
             }
             ha:text.32146 {
-             string=custom_HRO_TYPE-C-31-M-04; x=5.465mm; y=23.5mm; scale=100; fid=0;
+             string=USB-C; x=2.265mm; y=21.1mm; scale=100; fid=0;
              ha:flags {
               floater=1
              }
@@ -25793,7 +25769,7 @@ ha:pcb-rnd-board-v6 {
              x1=0.53mm; y1=69.475mm; x2=10.4mm; y2=69.475mm; thickness=0.1mm; clearance=0.0;
             }
             ha:text.32245 {
-             string=custom_HRO_TYPE-C-31-M-04; x=5.465mm; y=74.4mm; scale=100; fid=0;
+             string=USB-C; x=2.765mm; y=72.1mm; scale=100; fid=0;
              ha:flags {
               floater=1
              }
@@ -26241,12 +26217,12 @@ ha:pcb-rnd-board-v6 {
              x1=87.6mm; y1=30.9mm; x2=87.6mm; y2=29.3mm; thickness=0.1mm; clearance=0.0;
             }
             ha:text.80237 {
-             string=RESC1608X55M; x=87.2mm; y=30.1mm; scale=53; fid=0;
+             string=1k5; x=86.7mm; y=28.7mm; scale=53; fid=0;
              ha:flags {
               floater=1
               onsolder=1
              }
-             rot = 270.000000
+             rot = 360.000000
             }
            }
            ha:type {
@@ -26702,12 +26678,12 @@ ha:pcb-rnd-board-v6 {
              x1=90.2mm; y1=30.9mm; x2=90.2mm; y2=29.3mm; thickness=0.1mm; clearance=0.0;
             }
             ha:text.81919 {
-             string=RESC1608X55M; x=89.8mm; y=30.1mm; scale=53; fid=0;
+             string=1k5; x=89.3mm; y=28.7mm; scale=53; fid=0;
              ha:flags {
               floater=1
               onsolder=1
              }
-             rot = 270.000000
+             rot = 360.000000
             }
            }
            ha:type {
@@ -27175,7 +27151,7 @@ ha:pcb-rnd-board-v6 {
              x1=33.0mm; y1=25.2mm; x2=44.4mm; y2=25.2mm; thickness=0.1mm; clearance=0.0;
             }
             ha:text.84614 {
-             string=XTAL114X48X430M; x=38.7mm; y=27.6mm; scale=100; fid=0;
+             string=XTAL; x=37.2mm; y=31.0mm; scale=100; fid=0;
              ha:flags {
               clearline=1
               floater=1
@@ -29933,19 +29909,22 @@ ha:pcb-rnd-board-v6 {
               ha:attributes {
                 subc-role=origin
               }
-             }
+ ha:flags ={ selected=1
+ };             }
              ha:line.3474 {
               x1=42.85mm; y1=23.45mm; x2=43.85mm; y2=23.45mm; thickness=0.1mm; clearance=0.0;
               ha:attributes {
                 subc-role=x
               }
-             }
+ ha:flags ={ selected=1
+ };             }
              ha:line.3477 {
               x1=42.85mm; y1=23.45mm; x2=42.85mm; y2=22.45mm; thickness=0.1mm; clearance=0.0;
               ha:attributes {
                 subc-role=y
               }
-             }
+ ha:flags ={ selected=1
+ };             }
             }
             ha:type {
              bottom = 1
@@ -30030,7 +30009,7 @@ ha:pcb-rnd-board-v6 {
               x1=32.85mm; y1=32.45mm; x2=33.85mm; y2=33.45mm; thickness=0.1mm; clearance=0.0;
              }
              ha:text.3527 {
-              string=QFP50P2200X2200X160-144M; x=42.85mm; y=23.45mm; scale=100; fid=0;
+              string=MCU; x=41.75mm; y=25.65mm; scale=100; fid=0;
               ha:flags {
                clearline=1
                floater=1
@@ -30535,13 +30514,13 @@ ha:pcb-rnd-board-v6 {
               x1=47.0mm; y1=9.3mm; x2=47.0mm; y2=7.7mm; thickness=0.1mm; clearance=0.0;
              }
              ha:text.104458 {
-              string=CAPC1608X92M; x=46.6mm; y=8.5mm; scale=53; fid=0;
+              string=100nF; x=45.7mm; y=11.0mm; scale=53; fid=0;
               ha:flags {
                clearline=1
                floater=1
                onsolder=1
               }
-              rot = 270.000000
+              rot = 360.000000
              }
             }
             ha:type {
@@ -30600,353 +30579,6 @@ ha:pcb-rnd-board-v6 {
         }
          uid = tZ0nUHpYIB/iwyrbf3IAAAAT
         }
-       ha:subc.9448 {
-        ha:attributes {
-         value=BAT_18650
-         footprint=custom_18650_HOLDER.lht
-         refdes=B2
-        }
-       ha:data {
-              li:padstack_prototypes {
-
-        ha:ps_proto_v6.0 {
-          hdia=2.4mm; hplated=1; htop=0; hbottom=0;
-          li:shape {
-
-            ha:ps_shape_v4 {
-             ha:ps_circ { x=0.0; y=0.0; dia=3.0mm;             }
-             ha:combining {             }
-             ha:layer_mask {
-              copper = 1
-              top = 1
-             }
-             clearance=0.2mm
-            }
-
-            ha:ps_shape_v4 {
-             ha:ps_circ { x=0.0; y=0.0; dia=3.05mm;             }
-             ha:combining { sub=1; auto=1;             }
-             ha:layer_mask {
-              top = 1
-              mask = 1
-             }
-             clearance=0.0
-            }
-
-            ha:ps_shape_v4 {
-             ha:ps_circ { x=0.0; y=0.0; dia=3.0mm;             }
-             ha:combining {             }
-             ha:layer_mask {
-              copper = 1
-              intern = 1
-             }
-             clearance=0.2mm
-            }
-
-            ha:ps_shape_v4 {
-             ha:ps_circ { x=0.0; y=0.0; dia=3.0mm;             }
-             ha:combining {             }
-             ha:layer_mask {
-              bottom = 1
-              copper = 1
-             }
-             clearance=0.2mm
-            }
-
-            ha:ps_shape_v4 {
-             ha:ps_circ { x=0.0; y=0.0; dia=3.05mm;             }
-             ha:combining { sub=1; auto=1;             }
-             ha:layer_mask {
-              bottom = 1
-              mask = 1
-             }
-             clearance=0.0
-            }
-          }
-        }
-
-        ha:ps_proto_v6.1 {
-          hdia=3.2mm; hplated=0; htop=0; hbottom=0;
-          li:shape {
-
-            ha:ps_shape_v4 {
-             ha:ps_circ { x=0.0; y=0.0; dia=3.2mm;             }
-             ha:combining {             }
-             ha:layer_mask {
-              copper = 1
-              top = 1
-             }
-             clearance=0.2mm
-            }
-
-            ha:ps_shape_v4 {
-             ha:ps_circ { x=0.0; y=0.0; dia=3.25mm;             }
-             ha:combining { sub=1; auto=1;             }
-             ha:layer_mask {
-              top = 1
-              mask = 1
-             }
-             clearance=0.0
-            }
-
-            ha:ps_shape_v4 {
-             ha:ps_circ { x=0.0; y=0.0; dia=3.2mm;             }
-             ha:combining {             }
-             ha:layer_mask {
-              copper = 1
-              intern = 1
-             }
-             clearance=0.2mm
-            }
-
-            ha:ps_shape_v4 {
-             ha:ps_circ { x=0.0; y=0.0; dia=3.2mm;             }
-             ha:combining {             }
-             ha:layer_mask {
-              bottom = 1
-              copper = 1
-             }
-             clearance=0.2mm
-            }
-
-            ha:ps_shape_v4 {
-             ha:ps_circ { x=0.0; y=0.0; dia=3.25mm;             }
-             ha:combining { sub=1; auto=1;             }
-             ha:layer_mask {
-              bottom = 1
-              mask = 1
-             }
-             clearance=0.0
-            }
-          }
-        }
-       }
-
-        li:objects {
-         ha:padstack_ref.9503 {
-          proto=0; x=87.255mm; y=11.0mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
-          ha:flags {
-           clearline=1
-           selected=1
-          }
-
-          li:thermal {
-          }
-
-          ha:attributes {
-            term=1
-            name=1
-          }
-         }
-         ha:padstack_ref.9504 {
-          proto=0; x=14.355mm; y=11.0mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
-          ha:flags {
-           clearline=1
-           selected=1
-          }
-
-          li:thermal {
-            li:2 {
-             on  
-             diag  
-             round  
-             noshape  
-            }
-          }
-
-          ha:attributes {
-            term=2
-            name=2
-          }
-         }
-         ha:padstack_ref.9505 {
-          proto=1; x=78.61mm; y=11.0mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
-          ha:flags {
-           clearline=1
-           selected=1
-          }
-
-          li:thermal {
-          }
-
-          ha:attributes {
-            term=MH1
-            name=MH1
-          }
-         }
-         ha:padstack_ref.9506 {
-          proto=1; x=23.0mm; y=11.0mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
-          ha:flags {
-           clearline=1
-           selected=1
-          }
-
-          li:thermal {
-          }
-
-          ha:attributes {
-            term=MH2
-            name=MH2
-          }
-         }
-        }
-        li:layers {
-
-         ha:subc-aux {
-          lid=0
-          ha:combining {          }
-
-           li:objects {
-            ha:line.9449 {
-             x1=50.805mm; y1=11.0mm; x2=50.805mm; y2=11.0mm; thickness=0.1mm; clearance=0.0;
-             ha:attributes {
-               subc-role=origin
-             }
- ha:flags ={ selected=1
- };            }
-            ha:line.9452 {
-             x1=50.805mm; y1=11.0mm; x2=49.805mm; y2=11.0mm; thickness=0.1mm; clearance=0.0;
-             ha:attributes {
-               subc-role=x
-             }
- ha:flags ={ selected=1
- };            }
-            ha:line.9455 {
-             x1=50.805mm; y1=11.0mm; x2=50.805mm; y2=10.0mm; thickness=0.1mm; clearance=0.0;
-             ha:attributes {
-               subc-role=y
-             }
- ha:flags ={ selected=1
- };            }
-           }
-           ha:type {
-            top = 1
-            misc = 1
-            virtual = 1
-           }
-         }
-
-         ha:top-silkscreen {
-          lid=1
-          ha:combining {          }
-
-           li:objects {
-            ha:line.9458 {
-             x1=89.715mm; y1=21.51mm; x2=11.895mm; y2=21.51mm; thickness=0.12mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:line.9461 {
-             x1=11.895mm; y1=21.51mm; x2=11.895mm; y2=0.49mm; thickness=0.12mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:line.9464 {
-             x1=11.895mm; y1=0.49mm; x2=89.715mm; y2=0.49mm; thickness=0.12mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:line.9467 {
-             x1=89.715mm; y1=0.49mm; x2=89.715mm; y2=21.51mm; thickness=0.12mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:text.9470 {
-             string=%a.parent.refdes%; x=9.405mm; y=0.2mm; scale=100; fid=0;
-             ha:flags {
-              clearline=1
-              dyntext=1
-              floater=1
-              selected=1
-             }
-             rot = 360.000000
-            }
-           }
-           ha:type {
-            silk = 1
-            top = 1
-           }
-         }
-
-         ha:top-assembly {
-          lid=2
-          ha:combining {          }
-
-           li:objects {
-            ha:line.9471 {
-             x1=89.655mm; y1=21.45mm; x2=11.955mm; y2=21.45mm; thickness=0.1mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:line.9474 {
-             x1=11.955mm; y1=21.45mm; x2=11.955mm; y2=0.55mm; thickness=0.1mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:line.9477 {
-             x1=11.955mm; y1=0.55mm; x2=89.655mm; y2=0.55mm; thickness=0.1mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:line.9480 {
-             x1=89.655mm; y1=0.55mm; x2=89.655mm; y2=21.45mm; thickness=0.1mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:text.9483 {
-             string=custom_18650_HOLDER; x=50.805mm; y=11.0mm; scale=100; fid=0;
-             ha:flags {
-              clearline=1
-              floater=1
-              selected=1
-             }
-             rot = 180.000000
-            }
-           }
-           ha:type {
-            top = 1
-            doc = 1
-           }
-           purpose = assy
-         }
-
-         ha:top-courtyard {
-          lid=3
-          ha:combining {          }
-
-           li:objects {
-            ha:line.9484 {
-             x1=51.505mm; y1=11.0mm; x2=50.105mm; y2=11.0mm; thickness=0.05mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:line.9487 {
-             x1=50.805mm; y1=11.7mm; x2=50.805mm; y2=10.3mm; thickness=0.05mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:line.9490 {
-             x1=90.155mm; y1=21.95mm; x2=11.455mm; y2=21.95mm; thickness=0.05mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:line.9493 {
-             x1=11.455mm; y1=21.95mm; x2=11.455mm; y2=0.05mm; thickness=0.05mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:line.9496 {
-             x1=11.455mm; y1=0.05mm; x2=90.155mm; y2=0.05mm; thickness=0.05mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:line.9499 {
-             x1=90.155mm; y1=0.05mm; x2=90.155mm; y2=21.95mm; thickness=0.05mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-            ha:arc.9502 {
-             x=50.805mm; y=11.0mm; width=0.5mm; height=0.5mm; astart=180; adelta=360; thickness=0.05mm; clearance=0.0;
- ha:flags ={ selected=1
- };            }
-           }
-           ha:type {
-            top = 1
-            doc = 1
-           }
-           purpose = ko.courtyard
-         }
-        }
-       }
-        uid = JJDgnKyWHxEMTxRxi5sAAABA
- ha:flags ={ selected=1
- };       }
         ha:subc.113577 {
          ha:attributes {
           value=1k5
@@ -31293,9 +30925,9 @@ ha:pcb-rnd-board-v6 {
              }
             }
             ha:type {
-             misc = 1
+             bottom = 1
              virtual = 1
-              bottom = 1
+             misc = 1
             }
           }
 
@@ -31322,7 +30954,7 @@ ha:pcb-rnd-board-v6 {
             }
             ha:type {
              silk = 1
-              bottom = 1
+             bottom = 1
             }
           }
 
@@ -31344,17 +30976,17 @@ ha:pcb-rnd-board-v6 {
               x1=89.1mm; y1=17.1mm; x2=89.1mm; y2=15.5mm; thickness=0.1mm; clearance=0.0;
              }
              ha:text.113606 {
-              string=RESC1608X55M; x=88.7mm; y=16.3mm; scale=53; fid=0;
+              string=1k5; x=92.0mm; y=17.4mm; scale=53; fid=0;
               ha:flags {
                floater=1
                onsolder=1
               }
-              rot = 270.000000
+              rot = 360.000000
              }
             }
             ha:type {
+             bottom = 1
              doc = 1
-              bottom = 1
             }
             purpose = assy
           }
@@ -31399,8 +31031,8 @@ ha:pcb-rnd-board-v6 {
              }
             }
             ha:type {
+             bottom = 1
              doc = 1
-              bottom = 1
             }
             purpose = ko.courtyard
           }
@@ -31408,309 +31040,1281 @@ ha:pcb-rnd-board-v6 {
         }
          uid = cRcDE3o47ch0bEuEQgsAAABB
         }
-         ha:subc.118002 {
+        ha:subc.118002 {
+         ha:attributes {
+          value=1k5
+          footprint=RESC1608X55M.lht
+          refdes=R9
+         }
+        ha:data {
+                li:padstack_prototypes {
+
+         ha:ps_proto_v6.0 {
+           hdia=0.0; hplated=0; htop=0; hbottom=0;
+           li:shape {
+
+             ha:ps_shape_v4 {
+              ha:combining {              }
+              ha:layer_mask {
+               copper = 1
+               top = 1
+              }
+              clearance=0.2mm
+               li:ps_poly {
+                0.55mm  
+                -0.188mm  
+                0.547mm  
+                -0.22mm  
+                0.539mm  
+                -0.252mm  
+                0.525mm  
+                -0.281mm  
+                0.506mm  
+                -0.308mm  
+                0.483mm  
+                -0.331mm  
+                0.456mm  
+                -0.35mm  
+                0.427mm  
+                -0.364mm  
+                0.395mm  
+                -0.372mm  
+                0.363mm  
+                -0.375mm  
+                -0.363mm  
+                -0.375mm  
+                -0.395mm  
+                -0.372mm  
+                -0.427mm  
+                -0.364mm  
+                -0.456mm  
+                -0.35mm  
+                -0.483mm  
+                -0.331mm  
+                -0.506mm  
+                -0.308mm  
+                -0.525mm  
+                -0.281mm  
+                -0.539mm  
+                -0.252mm  
+                -0.547mm  
+                -0.22mm  
+                -0.55mm  
+                -0.188mm  
+                -0.55mm  
+                0.187mm  
+                -0.547mm  
+                0.22mm  
+                -0.539mm  
+                0.252mm  
+                -0.525mm  
+                0.281mm  
+                -0.506mm  
+                0.308mm  
+                -0.483mm  
+                0.331mm  
+                -0.456mm  
+                0.35mm  
+                -0.427mm  
+                0.364mm  
+                -0.395mm  
+                0.372mm  
+                -0.363mm  
+                0.375mm  
+                0.362mm  
+                0.375mm  
+                0.395mm  
+                0.372mm  
+                0.427mm  
+                0.364mm  
+                0.456mm  
+                0.35mm  
+                0.483mm  
+                0.331mm  
+                0.506mm  
+                0.308mm  
+                0.525mm  
+                0.281mm  
+                0.539mm  
+                0.252mm  
+                0.547mm  
+                0.22mm  
+                0.55mm  
+                0.188mm  
+               }
+             }
+
+             ha:ps_shape_v4 {
+              ha:combining { sub=1; auto=1;              }
+              ha:layer_mask {
+               top = 1
+               mask = 1
+              }
+              clearance=0.0
+               li:ps_poly {
+                0.6mm  
+                -0.225mm  
+                0.597mm  
+                -0.26mm  
+                0.588mm  
+                -0.293mm  
+                0.573mm  
+                -0.325mm  
+                0.553mm  
+                -0.354mm  
+                0.529mm  
+                -0.378mm  
+                0.5mm  
+                -0.398mm  
+                0.468mm  
+                -0.413mm  
+                0.435mm  
+                -0.422mm  
+                0.4mm  
+                -0.425mm  
+                -0.4mm  
+                -0.425mm  
+                -0.435mm  
+                -0.422mm  
+                -0.468mm  
+                -0.413mm  
+                -0.5mm  
+                -0.398mm  
+                -0.529mm  
+                -0.378mm  
+                -0.553mm  
+                -0.354mm  
+                -0.573mm  
+                -0.325mm  
+                -0.588mm  
+                -0.293mm  
+                -0.597mm  
+                -0.26mm  
+                -0.6mm  
+                -0.225mm  
+                -0.6mm  
+                0.225mm  
+                -0.597mm  
+                0.26mm  
+                -0.588mm  
+                0.293mm  
+                -0.573mm  
+                0.325mm  
+                -0.553mm  
+                0.354mm  
+                -0.529mm  
+                0.378mm  
+                -0.5mm  
+                0.398mm  
+                -0.468mm  
+                0.413mm  
+                -0.435mm  
+                0.422mm  
+                -0.4mm  
+                0.425mm  
+                0.4mm  
+                0.425mm  
+                0.435mm  
+                0.422mm  
+                0.468mm  
+                0.413mm  
+                0.5mm  
+                0.398mm  
+                0.529mm  
+                0.378mm  
+                0.553mm  
+                0.354mm  
+                0.573mm  
+                0.325mm  
+                0.588mm  
+                0.293mm  
+                0.597mm  
+                0.26mm  
+                0.6mm  
+                0.225mm  
+               }
+             }
+
+             ha:ps_shape_v4 {
+              ha:combining { auto=1;              }
+              ha:layer_mask {
+               top = 1
+               paste = 1
+              }
+              clearance=0.0
+               li:ps_poly {
+                0.55mm  
+                -0.188mm  
+                0.547mm  
+                -0.22mm  
+                0.539mm  
+                -0.252mm  
+                0.525mm  
+                -0.281mm  
+                0.506mm  
+                -0.308mm  
+                0.483mm  
+                -0.331mm  
+                0.456mm  
+                -0.35mm  
+                0.427mm  
+                -0.364mm  
+                0.395mm  
+                -0.372mm  
+                0.363mm  
+                -0.375mm  
+                -0.363mm  
+                -0.375mm  
+                -0.395mm  
+                -0.372mm  
+                -0.427mm  
+                -0.364mm  
+                -0.456mm  
+                -0.35mm  
+                -0.483mm  
+                -0.331mm  
+                -0.506mm  
+                -0.308mm  
+                -0.525mm  
+                -0.281mm  
+                -0.539mm  
+                -0.252mm  
+                -0.547mm  
+                -0.22mm  
+                -0.55mm  
+                -0.188mm  
+                -0.55mm  
+                0.187mm  
+                -0.547mm  
+                0.22mm  
+                -0.539mm  
+                0.252mm  
+                -0.525mm  
+                0.281mm  
+                -0.506mm  
+                0.308mm  
+                -0.483mm  
+                0.331mm  
+                -0.456mm  
+                0.35mm  
+                -0.427mm  
+                0.364mm  
+                -0.395mm  
+                0.372mm  
+                -0.363mm  
+                0.375mm  
+                0.362mm  
+                0.375mm  
+                0.395mm  
+                0.372mm  
+                0.427mm  
+                0.364mm  
+                0.456mm  
+                0.35mm  
+                0.483mm  
+                0.331mm  
+                0.506mm  
+                0.308mm  
+                0.525mm  
+                0.281mm  
+                0.539mm  
+                0.252mm  
+                0.547mm  
+                0.22mm  
+                0.55mm  
+                0.188mm  
+               }
+             }
+           }
+         }
+        }
+
+         li:objects {
+          ha:padstack_ref.118063 {
+           proto=0; x=90.8mm; y=17.0mm; rot=0.000000; xmirror=1; smirror=1; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+             li:3 {
+              on  
+              diag  
+              round  
+              noshape  
+             }
+           }
+
+           ha:attributes {
+             term=1
+             name=1
+           }
+          }
+          ha:padstack_ref.118064 {
+           proto=0; x=90.8mm; y=15.6mm; rot=0.000000; xmirror=1; smirror=1; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=2
+             name=2
+           }
+          }
+         }
+         li:layers {
+
+          ha:subc-aux {
+           lid=0
+           ha:combining {           }
+
+            li:objects {
+             ha:line.118003 {
+              x1=90.8mm; y1=16.3mm; x2=90.8mm; y2=16.3mm; thickness=0.1mm; clearance=0.0;
+              ha:attributes {
+                subc-role=origin
+              }
+             }
+             ha:line.118006 {
+              x1=90.8mm; y1=16.3mm; x2=91.8mm; y2=16.3mm; thickness=0.1mm; clearance=0.0;
+              ha:attributes {
+                subc-role=x
+              }
+             }
+             ha:line.118009 {
+              x1=90.8mm; y1=16.3mm; x2=90.8mm; y2=15.3mm; thickness=0.1mm; clearance=0.0;
+              ha:attributes {
+                subc-role=y
+              }
+             }
+            }
+            ha:type {
+             bottom = 1
+             virtual = 1
+             misc = 1
+            }
+          }
+
+          ha:top-silkscreen {
+           lid=1
+           ha:combining {           }
+
+            li:objects {
+             ha:line.118012 {
+              x1=89.99mm; y1=17.16mm; x2=89.99mm; y2=15.44mm; thickness=0.12mm; clearance=0.0;
+             }
+             ha:line.118015 {
+              x1=91.61mm; y1=17.16mm; x2=91.61mm; y2=15.44mm; thickness=0.12mm; clearance=0.0;
+             }
+             ha:text.118018 {
+              string=%a.parent.refdes%; x=90.2mm; y=14.9mm; scale=100; fid=0;
+              ha:flags {
+               dyntext=1
+               floater=1
+               onsolder=1
+              }
+              rot = 0.000000
+             }
+            }
+            ha:type {
+             silk = 1
+             bottom = 1
+            }
+          }
+
+          ha:top-assembly {
+           lid=2
+           ha:combining {           }
+
+            li:objects {
+             ha:line.118019 {
+              x1=90.4mm; y1=17.1mm; x2=91.2mm; y2=17.1mm; thickness=0.1mm; clearance=0.0;
+             }
+             ha:line.118022 {
+              x1=91.2mm; y1=17.1mm; x2=91.2mm; y2=15.5mm; thickness=0.1mm; clearance=0.0;
+             }
+             ha:line.118025 {
+              x1=91.2mm; y1=15.5mm; x2=90.4mm; y2=15.5mm; thickness=0.1mm; clearance=0.0;
+             }
+             ha:line.118028 {
+              x1=90.4mm; y1=15.5mm; x2=90.4mm; y2=17.1mm; thickness=0.1mm; clearance=0.0;
+             }
+             ha:text.118031 {
+              string=1k5; x=92.0mm; y=16.2mm; scale=53; fid=0;
+              ha:flags {
+               floater=1
+               onsolder=1
+              }
+              rot = 360.000000
+             }
+            }
+            ha:type {
+             bottom = 1
+             doc = 1
+            }
+            purpose = assy
+          }
+
+          ha:top-courtyard {
+           lid=3
+           ha:combining {           }
+
+            li:objects {
+             ha:line.118032 {
+              x1=90.1mm; y1=16.3mm; x2=91.5mm; y2=16.3mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.118035 {
+              x1=90.8mm; y1=17.0mm; x2=90.8mm; y2=15.6mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.118038 {
+              x1=90.07mm; y1=17.555mm; x2=90.07mm; y2=17.28mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.118041 {
+              x1=90.07mm; y1=17.28mm; x2=90.07mm; y2=15.32mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.118044 {
+              x1=90.07mm; y1=15.32mm; x2=90.07mm; y2=15.045mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.118047 {
+              x1=90.07mm; y1=15.045mm; x2=91.53mm; y2=15.045mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.118050 {
+              x1=91.53mm; y1=15.045mm; x2=91.53mm; y2=15.32mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.118053 {
+              x1=91.53mm; y1=15.32mm; x2=91.53mm; y2=17.28mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.118056 {
+              x1=91.53mm; y1=17.28mm; x2=91.53mm; y2=17.555mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.118059 {
+              x1=91.53mm; y1=17.555mm; x2=90.07mm; y2=17.555mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:arc.118062 {
+              x=90.8mm; y=16.3mm; width=0.5mm; height=0.5mm; astart=-0; adelta=-360; thickness=0.05mm; clearance=0.0;
+             }
+            }
+            ha:type {
+             bottom = 1
+             doc = 1
+            }
+            purpose = ko.courtyard
+          }
+         }
+        }
+         uid = cRcDE3o47ch0bEuEQgsAAABD
+        }
+        ha:subc.131721 {
+         ha:attributes {
+          footprint=open source hardware logo
+         }
+        ha:data {
+                li:padstack_prototypes {
+        }
+
+         li:objects {
+         }
+         li:layers {
+
+          ha:top-silkscreen {
+           lid=0
+           ha:combining {           }
+
+            li:objects {
+             ha:line.131722 {
+              x1=78.365mm; y1=96.3mm; x2=79.035mm; y2=96.3mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131725 {
+              x1=80.2mm; y1=91.835mm; x2=80.2mm; y2=91.165mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131728 {
+              x1=84.665mm; y1=96.3mm; x2=85.335mm; y2=96.3mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131731 {
+              x1=80.2mm; y1=98.135mm; x2=80.2mm; y2=97.465mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131734 {
+              x1=78.365mm; y1=95.64mm; x2=79.035mm; y2=95.64mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131737 {
+              x1=80.86mm; y1=91.835mm; x2=80.86mm; y2=91.165mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131740 {
+              x1=84.665mm; y1=95.64mm; x2=85.335mm; y2=95.64mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131743 {
+              x1=80.86mm; y1=98.135mm; x2=80.86mm; y2=97.465mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131746 {
+              x1=78.365mm; y1=94.98mm; x2=79.035mm; y2=94.98mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131749 {
+              x1=81.52mm; y1=91.835mm; x2=81.52mm; y2=91.165mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131752 {
+              x1=84.665mm; y1=94.98mm; x2=85.335mm; y2=94.98mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131755 {
+              x1=81.52mm; y1=98.135mm; x2=81.52mm; y2=97.465mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131758 {
+              x1=78.365mm; y1=94.32mm; x2=79.035mm; y2=94.32mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131761 {
+              x1=82.18mm; y1=91.835mm; x2=82.18mm; y2=91.165mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131764 {
+              x1=84.665mm; y1=94.32mm; x2=85.335mm; y2=94.32mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131767 {
+              x1=82.18mm; y1=98.135mm; x2=82.18mm; y2=97.465mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131770 {
+              x1=78.365mm; y1=93.66mm; x2=79.035mm; y2=93.66mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131773 {
+              x1=82.84mm; y1=91.835mm; x2=82.84mm; y2=91.165mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131776 {
+              x1=84.665mm; y1=93.66mm; x2=85.335mm; y2=93.66mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131779 {
+              x1=82.84mm; y1=98.135mm; x2=82.84mm; y2=97.465mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131782 {
+              x1=78.365mm; y1=93.0mm; x2=79.035mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131785 {
+              x1=83.5mm; y1=91.835mm; x2=83.5mm; y2=91.165mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131788 {
+              x1=84.665mm; y1=93.0mm; x2=85.335mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131791 {
+              x1=83.5mm; y1=98.135mm; x2=83.5mm; y2=97.465mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131794 {
+              x1=80.2mm; y1=96.8mm; x2=83.5mm; y2=96.8mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131797 {
+              x1=84.0mm; y1=96.3mm; x2=84.0mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131800 {
+              x1=83.5mm; y1=92.5mm; x2=80.2mm; y2=92.5mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131803 {
+              x1=79.7mm; y1=93.0mm; x2=79.7mm; y2=96.3mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131806 {
+              x1=80.2mm; y1=96.3mm; x2=81.52mm; y2=96.3mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131809 {
+              x1=81.52mm; y1=96.3mm; x2=81.52mm; y2=94.98mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131812 {
+              x1=81.52mm; y1=94.98mm; x2=80.2mm; y2=94.98mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131815 {
+              x1=80.2mm; y1=94.98mm; x2=80.2mm; y2=96.3mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131818 {
+              x1=83.5mm; y1=96.3mm; x2=82.18mm; y2=96.3mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131821 {
+              x1=82.18mm; y1=96.3mm; x2=82.18mm; y2=95.64mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131824 {
+              x1=82.18mm; y1=95.64mm; x2=83.5mm; y2=95.64mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131827 {
+              x1=83.5mm; y1=95.64mm; x2=83.5mm; y2=94.98mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131830 {
+              x1=83.5mm; y1=94.98mm; x2=82.18mm; y2=94.98mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131833 {
+              x1=80.2mm; y1=94.32mm; x2=80.2mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131836 {
+              x1=80.2mm; y1=93.66mm; x2=81.52mm; y2=93.66mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131839 {
+              x1=81.52mm; y1=94.32mm; x2=81.52mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131842 {
+              x1=82.18mm; y1=94.32mm; x2=82.18mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131845 {
+              x1=82.18mm; y1=93.0mm; x2=82.84mm; y2=93.66mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131848 {
+              x1=82.84mm; y1=93.66mm; x2=83.5mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:line.131851 {
+              x1=83.5mm; y1=93.0mm; x2=83.5mm; y2=94.32mm; thickness=0.33mm; clearance=0.0;
+             }
+             ha:arc.131854 {
+              x=80.2mm; y=96.3mm; width=0.5mm; height=0.5mm; astart=-0; adelta=90; thickness=0.33mm; clearance=0.0;
+             }
+             ha:arc.131855 {
+              x=83.5mm; y=96.3mm; width=0.5mm; height=0.5mm; astart=90; adelta=90; thickness=0.33mm; clearance=0.0;
+             }
+             ha:arc.131856 {
+              x=83.5mm; y=93.0mm; width=0.5mm; height=0.5mm; astart=-180; adelta=90; thickness=0.33mm; clearance=0.0;
+             }
+             ha:arc.131857 {
+              x=80.2mm; y=93.0mm; width=0.5mm; height=0.5mm; astart=-90; adelta=90; thickness=0.33mm; clearance=0.0;
+             }
+            }
+            ha:type {
+             silk = 1
+             bottom = 1
+            }
+          }
+
+          ha:subc-aux {
+           lid=1
+           ha:combining {           }
+
+            li:objects {
+            }
+            ha:type {
+             bottom = 1
+             virtual = 1
+             misc = 1
+            }
+          }
+         }
+        }
+         uid = qOQAS+gBEKxWZ1Tchh4AAABE
+        }
+        ha:subc.131930 {
+         ha:attributes {
+          value=LCD
+          footprint=custom_LCM1602.lht
+          refdes=J9
+         }
+        ha:data {
+                li:padstack_prototypes {
+
+         ha:ps_proto_v6.0 {
+           hdia=1.0mm; hplated=1; htop=0; hbottom=0;
+           li:shape {
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;              }
+              ha:combining {              }
+              ha:layer_mask {
+               copper = 1
+               top = 1
+              }
+              clearance=0.2mm
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=1.85mm;              }
+              ha:combining { sub=1; auto=1;              }
+              ha:layer_mask {
+               top = 1
+               mask = 1
+              }
+              clearance=0.0
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;              }
+              ha:combining {              }
+              ha:layer_mask {
+               copper = 1
+               intern = 1
+              }
+              clearance=0.2mm
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;              }
+              ha:combining {              }
+              ha:layer_mask {
+               bottom = 1
+               copper = 1
+              }
+              clearance=0.2mm
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=1.85mm;              }
+              ha:combining { sub=1; auto=1;              }
+              ha:layer_mask {
+               bottom = 1
+               mask = 1
+              }
+              clearance=0.0
+             }
+           }
+         }
+
+         ha:ps_proto_v6.1 {
+           hdia=2.8mm; hplated=0; htop=0; hbottom=0;
+           li:shape {
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=2.8mm;              }
+              ha:combining {              }
+              ha:layer_mask {
+               copper = 1
+               top = 1
+              }
+              clearance=0.2mm
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=2.85mm;              }
+              ha:combining { sub=1; auto=1;              }
+              ha:layer_mask {
+               top = 1
+               mask = 1
+              }
+              clearance=0.0
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=2.8mm;              }
+              ha:combining {              }
+              ha:layer_mask {
+               copper = 1
+               intern = 1
+              }
+              clearance=0.2mm
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=2.8mm;              }
+              ha:combining {              }
+              ha:layer_mask {
+               bottom = 1
+               copper = 1
+              }
+              clearance=0.2mm
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=2.85mm;              }
+              ha:combining { sub=1; auto=1;              }
+              ha:layer_mask {
+               bottom = 1
+               mask = 1
+              }
+              clearance=0.0
+             }
+           }
+         }
+        }
+
+         li:objects {
+          ha:padstack_ref.131985 {
+           proto=0; x=27.4mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+             li:2 {
+              on  
+              diag  
+              round  
+              noshape  
+             }
+             li:3 {
+              on  
+              diag  
+              round  
+              noshape  
+             }
+           }
+
+           ha:attributes {
+             term=1
+             name=1
+           }
+          }
+          ha:padstack_ref.131986 {
+           proto=0; x=29.94mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=2
+             name=2
+           }
+          }
+          ha:padstack_ref.131987 {
+           proto=0; x=32.48mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=3
+             name=3
+           }
+          }
+          ha:padstack_ref.131988 {
+           proto=0; x=35.02mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=4
+             name=4
+           }
+          }
+          ha:padstack_ref.131989 {
+           proto=0; x=37.56mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=5
+             name=5
+           }
+          }
+          ha:padstack_ref.131990 {
+           proto=0; x=40.1mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=6
+             name=6
+           }
+          }
+          ha:padstack_ref.131991 {
+           proto=0; x=42.64mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=7
+             name=7
+           }
+          }
+          ha:padstack_ref.131992 {
+           proto=0; x=45.18mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=8
+             name=8
+           }
+          }
+          ha:padstack_ref.131993 {
+           proto=0; x=47.72mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=9
+             name=9
+           }
+          }
+          ha:padstack_ref.131994 {
+           proto=0; x=50.26mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=10
+             name=10
+           }
+          }
+          ha:padstack_ref.131995 {
+           proto=0; x=52.8mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=11
+             name=11
+           }
+          }
+          ha:padstack_ref.131996 {
+           proto=0; x=55.34mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=12
+             name=12
+           }
+          }
+          ha:padstack_ref.131997 {
+           proto=0; x=57.88mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=13
+             name=13
+           }
+          }
+          ha:padstack_ref.131998 {
+           proto=0; x=60.42mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=14
+             name=14
+           }
+          }
+          ha:padstack_ref.131999 {
+           proto=0; x=62.96mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=15
+             name=15
+           }
+          }
+          ha:padstack_ref.132000 {
+           proto=0; x=65.5mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=16
+             name=16
+           }
+          }
+          ha:padstack_ref.132001 {
+           proto=1; x=21.8mm; y=56.4mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=MH1
+             name=MH1
+           }
+          }
+          ha:padstack_ref.132002 {
+           proto=1; x=97.0mm; y=56.4mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=MH2
+             name=MH2
+           }
+          }
+          ha:padstack_ref.132003 {
+           proto=1; x=21.8mm; y=87.6mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=MH3
+             name=MH3
+           }
+          }
+          ha:padstack_ref.132004 {
+           proto=1; x=97.0mm; y=87.6mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=MH4
+             name=MH4
+           }
+          }
+         }
+         li:layers {
+
+          ha:subc-aux {
+           lid=0
+           ha:combining {           }
+
+            li:objects {
+             ha:line.131931 {
+              x1=59.4mm; y1=72.0mm; x2=59.4mm; y2=72.0mm; thickness=0.1mm; clearance=0.0;
+              ha:attributes {
+                subc-role=origin
+              }
+             }
+             ha:line.131934 {
+              x1=59.4mm; y1=72.0mm; x2=60.4mm; y2=72.0mm; thickness=0.1mm; clearance=0.0;
+              ha:attributes {
+                subc-role=x
+              }
+             }
+             ha:line.131937 {
+              x1=59.4mm; y1=72.0mm; x2=59.4mm; y2=73.0mm; thickness=0.1mm; clearance=0.0;
+              ha:attributes {
+                subc-role=y
+              }
+             }
+            }
+            ha:type {
+             top = 1
+             misc = 1
+             virtual = 1
+            }
+          }
+
+          ha:top-silkscreen {
+           lid=1
+           ha:combining {           }
+
+            li:objects {
+             ha:line.131940 {
+              x1=19.34mm; y1=53.94mm; x2=99.46mm; y2=53.94mm; thickness=0.12mm; clearance=0.0;
+             }
+             ha:line.131943 {
+              x1=99.46mm; y1=53.94mm; x2=99.46mm; y2=90.06mm; thickness=0.12mm; clearance=0.0;
+             }
+             ha:line.131946 {
+              x1=99.46mm; y1=90.06mm; x2=19.34mm; y2=90.06mm; thickness=0.12mm; clearance=0.0;
+             }
+             ha:line.131949 {
+              x1=19.34mm; y1=90.06mm; x2=19.34mm; y2=53.94mm; thickness=0.12mm; clearance=0.0;
+             }
+             ha:text.131952 {
+              string=%a.parent.refdes%; x=59.4mm; y=72.0mm; scale=100; fid=0;
+              ha:flags {
+               dyntext=1
+               floater=1
+              }
+              rot = 0.000000
+             }
+            }
+            ha:type {
+             silk = 1
+             top = 1
+            }
+          }
+
+          ha:top-assembly {
+           lid=2
+           ha:combining {           }
+
+            li:objects {
+             ha:line.131953 {
+              x1=19.4mm; y1=54.0mm; x2=99.4mm; y2=54.0mm; thickness=0.1mm; clearance=0.0;
+             }
+             ha:line.131956 {
+              x1=99.4mm; y1=54.0mm; x2=99.4mm; y2=90.0mm; thickness=0.1mm; clearance=0.0;
+             }
+             ha:line.131959 {
+              x1=99.4mm; y1=90.0mm; x2=19.4mm; y2=90.0mm; thickness=0.1mm; clearance=0.0;
+             }
+             ha:line.131962 {
+              x1=19.4mm; y1=90.0mm; x2=19.4mm; y2=54.0mm; thickness=0.1mm; clearance=0.0;
+             }
+             ha:text.131965 {
+              string=LCM1602; x=56.5mm; y=69.3mm; scale=100; fid=0;
+              ha:flags {
+               floater=1
+              }
+              rot = 0.000000
+             }
+            }
+            ha:type {
+             top = 1
+             doc = 1
+            }
+            purpose = assy
+          }
+
+          ha:top-courtyard {
+           lid=3
+           ha:combining {           }
+
+            li:objects {
+             ha:line.131966 {
+              x1=58.7mm; y1=72.0mm; x2=60.1mm; y2=72.0mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.131969 {
+              x1=59.4mm; y1=71.3mm; x2=59.4mm; y2=72.7mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.131972 {
+              x1=18.9mm; y1=53.5mm; x2=99.9mm; y2=53.5mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.131975 {
+              x1=99.9mm; y1=53.5mm; x2=99.9mm; y2=90.5mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.131978 {
+              x1=99.9mm; y1=90.5mm; x2=18.9mm; y2=90.5mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.131981 {
+              x1=18.9mm; y1=90.5mm; x2=18.9mm; y2=53.5mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:arc.131984 {
+              x=59.4mm; y=72.0mm; width=0.5mm; height=0.5mm; astart=0; adelta=360; thickness=0.05mm; clearance=0.0;
+             }
+            }
+            ha:type {
+             top = 1
+             doc = 1
+            }
+            purpose = ko.courtyard
+          }
+         }
+        }
+         uid = qOQAS+gBEKxWZ1Tchh4AAABK
+        }
+         ha:subc.133268 {
           ha:attributes {
-           value=1k5
-           footprint=RESC1608X55M.lht
-           refdes=R9
+           value=BAT_EXT
+           footprint=custom_XH-2.54-2P.lht
+           refdes=B1
           }
          ha:data {
                   li:padstack_prototypes {
 
           ha:ps_proto_v6.0 {
-            hdia=0.0; hplated=0; htop=0; hbottom=0;
+            hdia=1.0mm; hplated=1; htop=0; hbottom=0;
             li:shape {
 
               ha:ps_shape_v4 {
+               ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;               }
                ha:combining {               }
                ha:layer_mask {
                 copper = 1
                 top = 1
                }
                clearance=0.2mm
-                li:ps_poly {
-                 0.55mm  
-                 -0.188mm  
-                 0.547mm  
-                 -0.22mm  
-                 0.539mm  
-                 -0.252mm  
-                 0.525mm  
-                 -0.281mm  
-                 0.506mm  
-                 -0.308mm  
-                 0.483mm  
-                 -0.331mm  
-                 0.456mm  
-                 -0.35mm  
-                 0.427mm  
-                 -0.364mm  
-                 0.395mm  
-                 -0.372mm  
-                 0.363mm  
-                 -0.375mm  
-                 -0.363mm  
-                 -0.375mm  
-                 -0.395mm  
-                 -0.372mm  
-                 -0.427mm  
-                 -0.364mm  
-                 -0.456mm  
-                 -0.35mm  
-                 -0.483mm  
-                 -0.331mm  
-                 -0.506mm  
-                 -0.308mm  
-                 -0.525mm  
-                 -0.281mm  
-                 -0.539mm  
-                 -0.252mm  
-                 -0.547mm  
-                 -0.22mm  
-                 -0.55mm  
-                 -0.188mm  
-                 -0.55mm  
-                 0.187mm  
-                 -0.547mm  
-                 0.22mm  
-                 -0.539mm  
-                 0.252mm  
-                 -0.525mm  
-                 0.281mm  
-                 -0.506mm  
-                 0.308mm  
-                 -0.483mm  
-                 0.331mm  
-                 -0.456mm  
-                 0.35mm  
-                 -0.427mm  
-                 0.364mm  
-                 -0.395mm  
-                 0.372mm  
-                 -0.363mm  
-                 0.375mm  
-                 0.362mm  
-                 0.375mm  
-                 0.395mm  
-                 0.372mm  
-                 0.427mm  
-                 0.364mm  
-                 0.456mm  
-                 0.35mm  
-                 0.483mm  
-                 0.331mm  
-                 0.506mm  
-                 0.308mm  
-                 0.525mm  
-                 0.281mm  
-                 0.539mm  
-                 0.252mm  
-                 0.547mm  
-                 0.22mm  
-                 0.55mm  
-                 0.188mm  
-                }
               }
 
               ha:ps_shape_v4 {
+               ha:ps_circ { x=0.0; y=0.0; dia=1.85mm;               }
                ha:combining { sub=1; auto=1;               }
                ha:layer_mask {
                 top = 1
                 mask = 1
                }
                clearance=0.0
-                li:ps_poly {
-                 0.6mm  
-                 -0.225mm  
-                 0.597mm  
-                 -0.26mm  
-                 0.588mm  
-                 -0.293mm  
-                 0.573mm  
-                 -0.325mm  
-                 0.553mm  
-                 -0.354mm  
-                 0.529mm  
-                 -0.378mm  
-                 0.5mm  
-                 -0.398mm  
-                 0.468mm  
-                 -0.413mm  
-                 0.435mm  
-                 -0.422mm  
-                 0.4mm  
-                 -0.425mm  
-                 -0.4mm  
-                 -0.425mm  
-                 -0.435mm  
-                 -0.422mm  
-                 -0.468mm  
-                 -0.413mm  
-                 -0.5mm  
-                 -0.398mm  
-                 -0.529mm  
-                 -0.378mm  
-                 -0.553mm  
-                 -0.354mm  
-                 -0.573mm  
-                 -0.325mm  
-                 -0.588mm  
-                 -0.293mm  
-                 -0.597mm  
-                 -0.26mm  
-                 -0.6mm  
-                 -0.225mm  
-                 -0.6mm  
-                 0.225mm  
-                 -0.597mm  
-                 0.26mm  
-                 -0.588mm  
-                 0.293mm  
-                 -0.573mm  
-                 0.325mm  
-                 -0.553mm  
-                 0.354mm  
-                 -0.529mm  
-                 0.378mm  
-                 -0.5mm  
-                 0.398mm  
-                 -0.468mm  
-                 0.413mm  
-                 -0.435mm  
-                 0.422mm  
-                 -0.4mm  
-                 0.425mm  
-                 0.4mm  
-                 0.425mm  
-                 0.435mm  
-                 0.422mm  
-                 0.468mm  
-                 0.413mm  
-                 0.5mm  
-                 0.398mm  
-                 0.529mm  
-                 0.378mm  
-                 0.553mm  
-                 0.354mm  
-                 0.573mm  
-                 0.325mm  
-                 0.588mm  
-                 0.293mm  
-                 0.597mm  
-                 0.26mm  
-                 0.6mm  
-                 0.225mm  
-                }
               }
 
               ha:ps_shape_v4 {
-               ha:combining { auto=1;               }
+               ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;               }
+               ha:combining {               }
                ha:layer_mask {
-                top = 1
-                paste = 1
+                copper = 1
+                intern = 1
+               }
+               clearance=0.2mm
+              }
+
+              ha:ps_shape_v4 {
+               ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;               }
+               ha:combining {               }
+               ha:layer_mask {
+                bottom = 1
+                copper = 1
+               }
+               clearance=0.2mm
+              }
+
+              ha:ps_shape_v4 {
+               ha:ps_circ { x=0.0; y=0.0; dia=1.85mm;               }
+               ha:combining { sub=1; auto=1;               }
+               ha:layer_mask {
+                bottom = 1
+                mask = 1
                }
                clearance=0.0
-                li:ps_poly {
-                 0.55mm  
-                 -0.188mm  
-                 0.547mm  
-                 -0.22mm  
-                 0.539mm  
-                 -0.252mm  
-                 0.525mm  
-                 -0.281mm  
-                 0.506mm  
-                 -0.308mm  
-                 0.483mm  
-                 -0.331mm  
-                 0.456mm  
-                 -0.35mm  
-                 0.427mm  
-                 -0.364mm  
-                 0.395mm  
-                 -0.372mm  
-                 0.363mm  
-                 -0.375mm  
-                 -0.363mm  
-                 -0.375mm  
-                 -0.395mm  
-                 -0.372mm  
-                 -0.427mm  
-                 -0.364mm  
-                 -0.456mm  
-                 -0.35mm  
-                 -0.483mm  
-                 -0.331mm  
-                 -0.506mm  
-                 -0.308mm  
-                 -0.525mm  
-                 -0.281mm  
-                 -0.539mm  
-                 -0.252mm  
-                 -0.547mm  
-                 -0.22mm  
-                 -0.55mm  
-                 -0.188mm  
-                 -0.55mm  
-                 0.187mm  
-                 -0.547mm  
-                 0.22mm  
-                 -0.539mm  
-                 0.252mm  
-                 -0.525mm  
-                 0.281mm  
-                 -0.506mm  
-                 0.308mm  
-                 -0.483mm  
-                 0.331mm  
-                 -0.456mm  
-                 0.35mm  
-                 -0.427mm  
-                 0.364mm  
-                 -0.395mm  
-                 0.372mm  
-                 -0.363mm  
-                 0.375mm  
-                 0.362mm  
-                 0.375mm  
-                 0.395mm  
-                 0.372mm  
-                 0.427mm  
-                 0.364mm  
-                 0.456mm  
-                 0.35mm  
-                 0.483mm  
-                 0.331mm  
-                 0.506mm  
-                 0.308mm  
-                 0.525mm  
-                 0.281mm  
-                 0.539mm  
-                 0.252mm  
-                 0.547mm  
-                 0.22mm  
-                 0.55mm  
-                 0.188mm  
-                }
               }
             }
           }
          }
 
           li:objects {
-           ha:padstack_ref.118063 {
-            proto=0; x=90.8mm; y=17.0mm; rot=0.000000; xmirror=1; smirror=1; clearance=0.2mm;
+           ha:padstack_ref.133323 {
+            proto=0; x=93.46mm; y=3.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
             ha:flags {
              clearline=1
             }
 
             li:thermal {
-              li:3 {
-               on  
-               diag  
-               round  
-               noshape  
-              }
             }
 
             ha:attributes {
@@ -31718,13 +32322,25 @@ ha:pcb-rnd-board-v6 {
               name=1
             }
            }
-           ha:padstack_ref.118064 {
-            proto=0; x=90.8mm; y=15.6mm; rot=0.000000; xmirror=1; smirror=1; clearance=0.2mm;
+           ha:padstack_ref.133324 {
+            proto=0; x=96.0mm; y=3.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
             ha:flags {
              clearline=1
             }
 
             li:thermal {
+              li:2 {
+               on  
+               diag  
+               round  
+               noshape  
+              }
+              li:3 {
+               on  
+               diag  
+               round  
+               noshape  
+              }
             }
 
             ha:attributes {
@@ -31740,29 +32356,29 @@ ha:pcb-rnd-board-v6 {
             ha:combining {            }
 
              li:objects {
-              ha:line.118003 {
-               x1=90.8mm; y1=16.3mm; x2=90.8mm; y2=16.3mm; thickness=0.1mm; clearance=0.0;
+              ha:line.133269 {
+               x1=94.73mm; y1=3.425mm; x2=94.73mm; y2=3.425mm; thickness=0.1mm; clearance=0.0;
                ha:attributes {
                  subc-role=origin
                }
               }
-              ha:line.118006 {
-               x1=90.8mm; y1=16.3mm; x2=91.8mm; y2=16.3mm; thickness=0.1mm; clearance=0.0;
+              ha:line.133272 {
+               x1=94.73mm; y1=3.425mm; x2=95.73mm; y2=3.425mm; thickness=0.1mm; clearance=0.0;
                ha:attributes {
                  subc-role=x
                }
               }
-              ha:line.118009 {
-               x1=90.8mm; y1=16.3mm; x2=90.8mm; y2=15.3mm; thickness=0.1mm; clearance=0.0;
+              ha:line.133275 {
+               x1=94.73mm; y1=3.425mm; x2=94.73mm; y2=4.425mm; thickness=0.1mm; clearance=0.0;
                ha:attributes {
                  subc-role=y
                }
               }
              }
              ha:type {
-              bottom = 1
-              virtual = 1
+              top = 1
               misc = 1
+              virtual = 1
              }
            }
 
@@ -31771,25 +32387,30 @@ ha:pcb-rnd-board-v6 {
             ha:combining {            }
 
              li:objects {
-              ha:line.118012 {
-               x1=89.99mm; y1=17.16mm; x2=89.99mm; y2=15.44mm; thickness=0.12mm; clearance=0.0;
+              ha:line.133278 {
+               x1=90.945mm; y1=0.49mm; x2=98.515mm; y2=0.49mm; thickness=0.12mm; clearance=0.0;
               }
-              ha:line.118015 {
-               x1=91.61mm; y1=17.16mm; x2=91.61mm; y2=15.44mm; thickness=0.12mm; clearance=0.0;
+              ha:line.133281 {
+               x1=98.515mm; y1=0.49mm; x2=98.515mm; y2=6.36mm; thickness=0.12mm; clearance=0.0;
               }
-              ha:text.118018 {
-               string=%a.parent.refdes%; x=90.2mm; y=14.9mm; scale=100; fid=0;
+              ha:line.133284 {
+               x1=98.515mm; y1=6.36mm; x2=90.945mm; y2=6.36mm; thickness=0.12mm; clearance=0.0;
+              }
+              ha:line.133287 {
+               x1=90.945mm; y1=6.36mm; x2=90.945mm; y2=0.49mm; thickness=0.12mm; clearance=0.0;
+              }
+              ha:text.133290 {
+               string=%a.parent.refdes%; x=88.03mm; y=0.525mm; scale=100; fid=0;
                ha:flags {
                 dyntext=1
                 floater=1
-                onsolder=1
                }
                rot = 0.000000
               }
              }
              ha:type {
               silk = 1
-              bottom = 1
+              top = 1
              }
            }
 
@@ -31798,29 +32419,28 @@ ha:pcb-rnd-board-v6 {
             ha:combining {            }
 
              li:objects {
-              ha:line.118019 {
-               x1=90.4mm; y1=17.1mm; x2=91.2mm; y2=17.1mm; thickness=0.1mm; clearance=0.0;
+              ha:line.133291 {
+               x1=91.005mm; y1=0.55mm; x2=3.8761811in; y2=0.55mm; thickness=0.1mm; clearance=0.0;
               }
-              ha:line.118022 {
-               x1=91.2mm; y1=17.1mm; x2=91.2mm; y2=15.5mm; thickness=0.1mm; clearance=0.0;
+              ha:line.133294 {
+               x1=3.8761811in; y1=0.55mm; x2=3.8761811in; y2=6.3mm; thickness=0.1mm; clearance=0.0;
               }
-              ha:line.118025 {
-               x1=91.2mm; y1=15.5mm; x2=90.4mm; y2=15.5mm; thickness=0.1mm; clearance=0.0;
+              ha:line.133297 {
+               x1=3.8761811in; y1=6.3mm; x2=91.005mm; y2=6.3mm; thickness=0.1mm; clearance=0.0;
               }
-              ha:line.118028 {
-               x1=90.4mm; y1=15.5mm; x2=90.4mm; y2=17.1mm; thickness=0.1mm; clearance=0.0;
+              ha:line.133300 {
+               x1=91.005mm; y1=6.3mm; x2=91.005mm; y2=0.55mm; thickness=0.1mm; clearance=0.0;
               }
-              ha:text.118031 {
-               string=RESC1608X55M; x=90.8mm; y=16.3mm; scale=53; fid=0;
+              ha:text.133303 {
+               string=BAT; x=93.53mm; y=40.35433071mil; scale=100; fid=0;
                ha:flags {
                 floater=1
-                onsolder=1
                }
-               rot = 90.000000
+               rot = 0.000000
               }
              }
              ha:type {
-              bottom = 1
+              top = 1
               doc = 1
              }
              purpose = assy
@@ -31831,1470 +32451,810 @@ ha:pcb-rnd-board-v6 {
             ha:combining {            }
 
              li:objects {
-              ha:line.118032 {
-               x1=90.1mm; y1=16.3mm; x2=91.5mm; y2=16.3mm; thickness=0.05mm; clearance=0.0;
+              ha:line.133304 {
+               x1=94.03mm; y1=3.425mm; x2=95.43mm; y2=3.425mm; thickness=0.05mm; clearance=0.0;
               }
-              ha:line.118035 {
-               x1=90.8mm; y1=17.0mm; x2=90.8mm; y2=15.6mm; thickness=0.05mm; clearance=0.0;
+              ha:line.133307 {
+               x1=94.73mm; y1=2.725mm; x2=94.73mm; y2=4.125mm; thickness=0.05mm; clearance=0.0;
               }
-              ha:line.118038 {
-               x1=90.07mm; y1=17.555mm; x2=90.07mm; y2=17.28mm; thickness=0.05mm; clearance=0.0;
+              ha:line.133310 {
+               x1=90.505mm; y1=0.05mm; x2=98.955mm; y2=0.05mm; thickness=0.05mm; clearance=0.0;
               }
-              ha:line.118041 {
-               x1=90.07mm; y1=17.28mm; x2=90.07mm; y2=15.32mm; thickness=0.05mm; clearance=0.0;
+              ha:line.133313 {
+               x1=98.955mm; y1=0.05mm; x2=98.955mm; y2=6.8mm; thickness=0.05mm; clearance=0.0;
               }
-              ha:line.118044 {
-               x1=90.07mm; y1=15.32mm; x2=90.07mm; y2=15.045mm; thickness=0.05mm; clearance=0.0;
+              ha:line.133316 {
+               x1=98.955mm; y1=6.8mm; x2=90.505mm; y2=6.8mm; thickness=0.05mm; clearance=0.0;
               }
-              ha:line.118047 {
-               x1=90.07mm; y1=15.045mm; x2=91.53mm; y2=15.045mm; thickness=0.05mm; clearance=0.0;
+              ha:line.133319 {
+               x1=90.505mm; y1=6.8mm; x2=90.505mm; y2=0.05mm; thickness=0.05mm; clearance=0.0;
               }
-              ha:line.118050 {
-               x1=91.53mm; y1=15.045mm; x2=91.53mm; y2=15.32mm; thickness=0.05mm; clearance=0.0;
-              }
-              ha:line.118053 {
-               x1=91.53mm; y1=15.32mm; x2=91.53mm; y2=17.28mm; thickness=0.05mm; clearance=0.0;
-              }
-              ha:line.118056 {
-               x1=91.53mm; y1=17.28mm; x2=91.53mm; y2=17.555mm; thickness=0.05mm; clearance=0.0;
-              }
-              ha:line.118059 {
-               x1=91.53mm; y1=17.555mm; x2=90.07mm; y2=17.555mm; thickness=0.05mm; clearance=0.0;
-              }
-              ha:arc.118062 {
-               x=90.8mm; y=16.3mm; width=0.5mm; height=0.5mm; astart=-0; adelta=-360; thickness=0.05mm; clearance=0.0;
+              ha:arc.133322 {
+               x=94.73mm; y=3.425mm; width=0.5mm; height=0.5mm; astart=0; adelta=360; thickness=0.05mm; clearance=0.0;
               }
              }
              ha:type {
-              bottom = 1
+              top = 1
               doc = 1
              }
              purpose = ko.courtyard
            }
           }
          }
-          uid = cRcDE3o47ch0bEuEQgsAAABD
+          uid = qOQAS+gBEKxWZ1Tchh4AAABU
          }
-            ha:subc.131721 {
-             ha:attributes {
-              footprint=open source hardware logo
-             }
-            ha:data {
-                        li:padstack_prototypes {
-            }
+        ha:subc.132943 {
+         ha:attributes {
+          value=OLED
+          footprint=custom_OLED0.96.lht
+          refdes=U5
+         }
+        ha:data {
+                li:padstack_prototypes {
 
-             li:objects {
-             }
-             li:layers {
+         ha:ps_proto_v6.0 {
+           hdia=1.0mm; hplated=1; htop=0; hbottom=0;
+           li:shape {
 
-              ha:top-silkscreen {
-               lid=0
-               ha:combining {               }
-
-                li:objects {
-                 ha:line.131722 {
-                  x1=78.365mm; y1=96.3mm; x2=79.035mm; y2=96.3mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131725 {
-                  x1=80.2mm; y1=91.835mm; x2=80.2mm; y2=91.165mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131728 {
-                  x1=84.665mm; y1=96.3mm; x2=85.335mm; y2=96.3mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131731 {
-                  x1=80.2mm; y1=98.135mm; x2=80.2mm; y2=97.465mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131734 {
-                  x1=78.365mm; y1=95.64mm; x2=79.035mm; y2=95.64mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131737 {
-                  x1=80.86mm; y1=91.835mm; x2=80.86mm; y2=91.165mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131740 {
-                  x1=84.665mm; y1=95.64mm; x2=85.335mm; y2=95.64mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131743 {
-                  x1=80.86mm; y1=98.135mm; x2=80.86mm; y2=97.465mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131746 {
-                  x1=78.365mm; y1=94.98mm; x2=79.035mm; y2=94.98mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131749 {
-                  x1=81.52mm; y1=91.835mm; x2=81.52mm; y2=91.165mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131752 {
-                  x1=84.665mm; y1=94.98mm; x2=85.335mm; y2=94.98mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131755 {
-                  x1=81.52mm; y1=98.135mm; x2=81.52mm; y2=97.465mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131758 {
-                  x1=78.365mm; y1=94.32mm; x2=79.035mm; y2=94.32mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131761 {
-                  x1=82.18mm; y1=91.835mm; x2=82.18mm; y2=91.165mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131764 {
-                  x1=84.665mm; y1=94.32mm; x2=85.335mm; y2=94.32mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131767 {
-                  x1=82.18mm; y1=98.135mm; x2=82.18mm; y2=97.465mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131770 {
-                  x1=78.365mm; y1=93.66mm; x2=79.035mm; y2=93.66mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131773 {
-                  x1=82.84mm; y1=91.835mm; x2=82.84mm; y2=91.165mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131776 {
-                  x1=84.665mm; y1=93.66mm; x2=85.335mm; y2=93.66mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131779 {
-                  x1=82.84mm; y1=98.135mm; x2=82.84mm; y2=97.465mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131782 {
-                  x1=78.365mm; y1=93.0mm; x2=79.035mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131785 {
-                  x1=83.5mm; y1=91.835mm; x2=83.5mm; y2=91.165mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131788 {
-                  x1=84.665mm; y1=93.0mm; x2=85.335mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131791 {
-                  x1=83.5mm; y1=98.135mm; x2=83.5mm; y2=97.465mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131794 {
-                  x1=80.2mm; y1=96.8mm; x2=83.5mm; y2=96.8mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131797 {
-                  x1=84.0mm; y1=96.3mm; x2=84.0mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131800 {
-                  x1=83.5mm; y1=92.5mm; x2=80.2mm; y2=92.5mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131803 {
-                  x1=79.7mm; y1=93.0mm; x2=79.7mm; y2=96.3mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131806 {
-                  x1=80.2mm; y1=96.3mm; x2=81.52mm; y2=96.3mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131809 {
-                  x1=81.52mm; y1=96.3mm; x2=81.52mm; y2=94.98mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131812 {
-                  x1=81.52mm; y1=94.98mm; x2=80.2mm; y2=94.98mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131815 {
-                  x1=80.2mm; y1=94.98mm; x2=80.2mm; y2=96.3mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131818 {
-                  x1=83.5mm; y1=96.3mm; x2=82.18mm; y2=96.3mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131821 {
-                  x1=82.18mm; y1=96.3mm; x2=82.18mm; y2=95.64mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131824 {
-                  x1=82.18mm; y1=95.64mm; x2=83.5mm; y2=95.64mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131827 {
-                  x1=83.5mm; y1=95.64mm; x2=83.5mm; y2=94.98mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131830 {
-                  x1=83.5mm; y1=94.98mm; x2=82.18mm; y2=94.98mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131833 {
-                  x1=80.2mm; y1=94.32mm; x2=80.2mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131836 {
-                  x1=80.2mm; y1=93.66mm; x2=81.52mm; y2=93.66mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131839 {
-                  x1=81.52mm; y1=94.32mm; x2=81.52mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131842 {
-                  x1=82.18mm; y1=94.32mm; x2=82.18mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131845 {
-                  x1=82.18mm; y1=93.0mm; x2=82.84mm; y2=93.66mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131848 {
-                  x1=82.84mm; y1=93.66mm; x2=83.5mm; y2=93.0mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:line.131851 {
-                  x1=83.5mm; y1=93.0mm; x2=83.5mm; y2=94.32mm; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:arc.131854 {
-                  x=80.2mm; y=96.3mm; width=0.5mm; height=0.5mm; astart=-0; adelta=90; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:arc.131855 {
-                  x=83.5mm; y=96.3mm; width=0.5mm; height=0.5mm; astart=90; adelta=90; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:arc.131856 {
-                  x=83.5mm; y=93.0mm; width=0.5mm; height=0.5mm; astart=-180; adelta=90; thickness=0.33mm; clearance=0.0;
-                 }
-                 ha:arc.131857 {
-                  x=80.2mm; y=93.0mm; width=0.5mm; height=0.5mm; astart=-90; adelta=90; thickness=0.33mm; clearance=0.0;
-                 }
-                }
-                ha:type {
-                 silk = 1
-                 bottom = 1
-                }
-              }
-
-              ha:subc-aux {
-               lid=1
-               ha:combining {               }
-
-                li:objects {
-                }
-                ha:type {
-                 bottom = 1
-                 virtual = 1
-                 misc = 1
-                }
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;              }
+              ha:combining {              }
+              ha:layer_mask {
+               copper = 1
+               top = 1
               }
+              clearance=0.2mm
              }
-            }
-             uid = qOQAS+gBEKxWZ1Tchh4AAABE
-            }
-             ha:subc.131930 {
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=1.85mm;              }
+              ha:combining { sub=1; auto=1;              }
+              ha:layer_mask {
+               top = 1
+               mask = 1
+              }
+              clearance=0.0
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;              }
+              ha:combining {              }
+              ha:layer_mask {
+               copper = 1
+               intern = 1
+              }
+              clearance=0.2mm
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;              }
+              ha:combining {              }
+              ha:layer_mask {
+               bottom = 1
+               copper = 1
+              }
+              clearance=0.2mm
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=1.85mm;              }
+              ha:combining { sub=1; auto=1;              }
+              ha:layer_mask {
+               bottom = 1
+               mask = 1
+              }
+              clearance=0.0
+             }
+           }
+         }
+
+         ha:ps_proto_v6.1 {
+           hdia=2.8mm; hplated=0; htop=0; hbottom=0;
+           li:shape {
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=2.8mm;              }
+              ha:combining {              }
+              ha:layer_mask {
+               copper = 1
+               top = 1
+              }
+              clearance=0.2mm
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=2.85mm;              }
+              ha:combining { sub=1; auto=1;              }
+              ha:layer_mask {
+               top = 1
+               mask = 1
+              }
+              clearance=0.0
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=2.8mm;              }
+              ha:combining {              }
+              ha:layer_mask {
+               copper = 1
+               intern = 1
+              }
+              clearance=0.2mm
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=2.8mm;              }
+              ha:combining {              }
+              ha:layer_mask {
+               bottom = 1
+               copper = 1
+              }
+              clearance=0.2mm
+             }
+
+             ha:ps_shape_v4 {
+              ha:ps_circ { x=0.0; y=0.0; dia=2.85mm;              }
+              ha:combining { sub=1; auto=1;              }
+              ha:layer_mask {
+               bottom = 1
+               mask = 1
+              }
+              clearance=0.0
+             }
+           }
+         }
+        }
+
+         li:objects {
+          ha:padstack_ref.132998 {
+           proto=0; x=82.13mm; y=27.24mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+             li:1 {
+              on  
+              diag  
+              round  
+              noshape  
+             }
+             li:2 {
+              on  
+              diag  
+              round  
+              noshape  
+             }
+             li:3 {
+              on  
+              diag  
+              round  
+              noshape  
+             }
+           }
+
+           ha:attributes {
+             term=1
+             name=1
+           }
+          }
+          ha:padstack_ref.132999 {
+           proto=0; x=84.67mm; y=27.24mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=2
+             name=2
+           }
+          }
+          ha:padstack_ref.133000 {
+           proto=0; x=87.21mm; y=27.24mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=3
+             name=3
+           }
+          }
+          ha:padstack_ref.133001 {
+           proto=0; x=89.75mm; y=27.24mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=4
+             name=4
+           }
+          }
+          ha:padstack_ref.133002 {
+           proto=1; x=75.69mm; y=27.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=MH1
+             name=MH1
+           }
+          }
+          ha:padstack_ref.133003 {
+           proto=1; x=96.19mm; y=27.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=MH2
+             name=MH2
+           }
+          }
+          ha:padstack_ref.133004 {
+           proto=1; x=75.69mm; y=50.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=MH3
+             name=MH3
+           }
+          }
+          ha:padstack_ref.133005 {
+           proto=1; x=96.19mm; y=50.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=MH4
+             name=MH4
+           }
+          }
+          ha:padstack_ref.133006 {
+           proto=1; x=74.79mm; y=27.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=MH5
+             name=MH5
+           }
+          }
+          ha:padstack_ref.133007 {
+           proto=1; x=97.09mm; y=27.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=MH6
+             name=MH6
+           }
+          }
+          ha:padstack_ref.133008 {
+           proto=1; x=74.79mm; y=50.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=MH7
+             name=MH7
+           }
+          }
+          ha:padstack_ref.133009 {
+           proto=1; x=97.09mm; y=50.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:flags {
+            clearline=1
+           }
+
+           li:thermal {
+           }
+
+           ha:attributes {
+             term=MH8
+             name=MH8
+           }
+          }
+         }
+         li:layers {
+
+          ha:subc-aux {
+           lid=0
+           ha:combining {           }
+
+            li:objects {
+             ha:line.132944 {
+              x1=85.94mm; y1=39.24mm; x2=85.94mm; y2=39.24mm; thickness=0.1mm; clearance=0.0;
               ha:attributes {
-               value=LCD
-               footprint=custom_LCM1602.lht
-               refdes=J9
+                subc-role=origin
               }
-             ha:data {
-                          li:padstack_prototypes {
-
-              ha:ps_proto_v6.0 {
-                hdia=1.0mm; hplated=1; htop=0; hbottom=0;
-                li:shape {
-
-                  ha:ps_shape_v4 {
-                   ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;                   }
-                   ha:combining {                   }
-                   ha:layer_mask {
-                    copper = 1
-                    top = 1
-                   }
-                   clearance=0.2mm
-                  }
-
-                  ha:ps_shape_v4 {
-                   ha:ps_circ { x=0.0; y=0.0; dia=1.85mm;                   }
-                   ha:combining { sub=1; auto=1;                   }
-                   ha:layer_mask {
-                    top = 1
-                    mask = 1
-                   }
-                   clearance=0.0
-                  }
-
-                  ha:ps_shape_v4 {
-                   ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;                   }
-                   ha:combining {                   }
-                   ha:layer_mask {
-                    copper = 1
-                    intern = 1
-                   }
-                   clearance=0.2mm
-                  }
-
-                  ha:ps_shape_v4 {
-                   ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;                   }
-                   ha:combining {                   }
-                   ha:layer_mask {
-                    bottom = 1
-                    copper = 1
-                   }
-                   clearance=0.2mm
-                  }
-
-                  ha:ps_shape_v4 {
-                   ha:ps_circ { x=0.0; y=0.0; dia=1.85mm;                   }
-                   ha:combining { sub=1; auto=1;                   }
-                   ha:layer_mask {
-                    bottom = 1
-                    mask = 1
-                   }
-                   clearance=0.0
-                  }
-                }
+ ha:flags ={ selected=1
+ };             }
+             ha:line.132947 {
+              x1=85.94mm; y1=39.24mm; x2=86.94mm; y2=39.24mm; thickness=0.1mm; clearance=0.0;
+              ha:attributes {
+                subc-role=x
               }
-
-              ha:ps_proto_v6.1 {
-                hdia=2.8mm; hplated=0; htop=0; hbottom=0;
-                li:shape {
-
-                  ha:ps_shape_v4 {
-                   ha:ps_circ { x=0.0; y=0.0; dia=2.8mm;                   }
-                   ha:combining {                   }
-                   ha:layer_mask {
-                    copper = 1
-                    top = 1
-                   }
-                   clearance=0.2mm
-                  }
-
-                  ha:ps_shape_v4 {
-                   ha:ps_circ { x=0.0; y=0.0; dia=2.85mm;                   }
-                   ha:combining { sub=1; auto=1;                   }
-                   ha:layer_mask {
-                    top = 1
-                    mask = 1
-                   }
-                   clearance=0.0
-                  }
-
-                  ha:ps_shape_v4 {
-                   ha:ps_circ { x=0.0; y=0.0; dia=2.8mm;                   }
-                   ha:combining {                   }
-                   ha:layer_mask {
-                    copper = 1
-                    intern = 1
-                   }
-                   clearance=0.2mm
-                  }
-
-                  ha:ps_shape_v4 {
-                   ha:ps_circ { x=0.0; y=0.0; dia=2.8mm;                   }
-                   ha:combining {                   }
-                   ha:layer_mask {
-                    bottom = 1
-                    copper = 1
-                   }
-                   clearance=0.2mm
-                  }
-
-                  ha:ps_shape_v4 {
-                   ha:ps_circ { x=0.0; y=0.0; dia=2.85mm;                   }
-                   ha:combining { sub=1; auto=1;                   }
-                   ha:layer_mask {
-                    bottom = 1
-                    mask = 1
-                   }
-                   clearance=0.0
-                  }
-                }
+ ha:flags ={ selected=1
+ };             }
+             ha:line.132950 {
+              x1=85.94mm; y1=39.24mm; x2=85.94mm; y2=40.24mm; thickness=0.1mm; clearance=0.0;
+              ha:attributes {
+                subc-role=y
               }
+ ha:flags ={ selected=1
+ };             }
+            }
+            ha:type {
+             top = 1
+             misc = 1
+             virtual = 1
+            }
+          }
+
+          ha:top-silkscreen {
+           lid=1
+           ha:combining {           }
+
+            li:objects {
+             ha:line.132953 {
+              x1=72.38mm; y1=25.68mm; x2=99.5mm; y2=25.68mm; thickness=0.12mm; clearance=0.0;
              }
-
-              li:objects {
-               ha:padstack_ref.131985 {
-                proto=0; x=27.4mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                  li:2 {
-                   on  
-                   diag  
-                   round  
-                   noshape  
-                  }
-                  li:3 {
-                   on  
-                   diag  
-                   round  
-                   noshape  
-                  }
-                }
-
-                ha:attributes {
-                  term=1
-                  name=1
-                }
-               }
-               ha:padstack_ref.131986 {
-                proto=0; x=29.94mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=2
-                  name=2
-                }
-               }
-               ha:padstack_ref.131987 {
-                proto=0; x=32.48mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=3
-                  name=3
-                }
-               }
-               ha:padstack_ref.131988 {
-                proto=0; x=35.02mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=4
-                  name=4
-                }
-               }
-               ha:padstack_ref.131989 {
-                proto=0; x=37.56mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=5
-                  name=5
-                }
-               }
-               ha:padstack_ref.131990 {
-                proto=0; x=40.1mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=6
-                  name=6
-                }
-               }
-               ha:padstack_ref.131991 {
-                proto=0; x=42.64mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=7
-                  name=7
-                }
-               }
-               ha:padstack_ref.131992 {
-                proto=0; x=45.18mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=8
-                  name=8
-                }
-               }
-               ha:padstack_ref.131993 {
-                proto=0; x=47.72mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=9
-                  name=9
-                }
-               }
-               ha:padstack_ref.131994 {
-                proto=0; x=50.26mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=10
-                  name=10
-                }
-               }
-               ha:padstack_ref.131995 {
-                proto=0; x=52.8mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=11
-                  name=11
-                }
-               }
-               ha:padstack_ref.131996 {
-                proto=0; x=55.34mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=12
-                  name=12
-                }
-               }
-               ha:padstack_ref.131997 {
-                proto=0; x=57.88mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=13
-                  name=13
-                }
-               }
-               ha:padstack_ref.131998 {
-                proto=0; x=60.42mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=14
-                  name=14
-                }
-               }
-               ha:padstack_ref.131999 {
-                proto=0; x=62.96mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=15
-                  name=15
-                }
-               }
-               ha:padstack_ref.132000 {
-                proto=0; x=65.5mm; y=56.54mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=16
-                  name=16
-                }
-               }
-               ha:padstack_ref.132001 {
-                proto=1; x=21.8mm; y=56.4mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=MH1
-                  name=MH1
-                }
-               }
-               ha:padstack_ref.132002 {
-                proto=1; x=97.0mm; y=56.4mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=MH2
-                  name=MH2
-                }
-               }
-               ha:padstack_ref.132003 {
-                proto=1; x=21.8mm; y=87.6mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=MH3
-                  name=MH3
-                }
-               }
-               ha:padstack_ref.132004 {
-                proto=1; x=97.0mm; y=87.6mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                ha:flags {
-                 clearline=1
-                }
-
-                li:thermal {
-                }
-
-                ha:attributes {
-                  term=MH4
-                  name=MH4
-                }
-               }
-              }
-              li:layers {
-
-               ha:subc-aux {
-                lid=0
-                ha:combining {                }
-
-                 li:objects {
-                  ha:line.131931 {
-                   x1=59.4mm; y1=72.0mm; x2=59.4mm; y2=72.0mm; thickness=0.1mm; clearance=0.0;
-                   ha:attributes {
-                     subc-role=origin
-                   }
-                  }
-                  ha:line.131934 {
-                   x1=59.4mm; y1=72.0mm; x2=60.4mm; y2=72.0mm; thickness=0.1mm; clearance=0.0;
-                   ha:attributes {
-                     subc-role=x
-                   }
-                  }
-                  ha:line.131937 {
-                   x1=59.4mm; y1=72.0mm; x2=59.4mm; y2=73.0mm; thickness=0.1mm; clearance=0.0;
-                   ha:attributes {
-                     subc-role=y
-                   }
-                  }
-                 }
-                 ha:type {
-                  top = 1
-                  misc = 1
-                  virtual = 1
-                 }
-               }
-
-               ha:top-silkscreen {
-                lid=1
-                ha:combining {                }
-
-                 li:objects {
-                  ha:line.131940 {
-                   x1=19.34mm; y1=53.94mm; x2=99.46mm; y2=53.94mm; thickness=0.12mm; clearance=0.0;
-                  }
-                  ha:line.131943 {
-                   x1=99.46mm; y1=53.94mm; x2=99.46mm; y2=90.06mm; thickness=0.12mm; clearance=0.0;
-                  }
-                  ha:line.131946 {
-                   x1=99.46mm; y1=90.06mm; x2=19.34mm; y2=90.06mm; thickness=0.12mm; clearance=0.0;
-                  }
-                  ha:line.131949 {
-                   x1=19.34mm; y1=90.06mm; x2=19.34mm; y2=53.94mm; thickness=0.12mm; clearance=0.0;
-                  }
-                  ha:text.131952 {
-                   string=%a.parent.refdes%; x=59.4mm; y=72.0mm; scale=100; fid=0;
-                   ha:flags {
-                    dyntext=1
-                    floater=1
-                   }
-                   rot = 0.000000
-                  }
-                 }
-                 ha:type {
-                  silk = 1
-                  top = 1
-                 }
-               }
-
-               ha:top-assembly {
-                lid=2
-                ha:combining {                }
-
-                 li:objects {
-                  ha:line.131953 {
-                   x1=19.4mm; y1=54.0mm; x2=99.4mm; y2=54.0mm; thickness=0.1mm; clearance=0.0;
-                  }
-                  ha:line.131956 {
-                   x1=99.4mm; y1=54.0mm; x2=99.4mm; y2=90.0mm; thickness=0.1mm; clearance=0.0;
-                  }
-                  ha:line.131959 {
-                   x1=99.4mm; y1=90.0mm; x2=19.4mm; y2=90.0mm; thickness=0.1mm; clearance=0.0;
-                  }
-                  ha:line.131962 {
-                   x1=19.4mm; y1=90.0mm; x2=19.4mm; y2=54.0mm; thickness=0.1mm; clearance=0.0;
-                  }
-                  ha:text.131965 {
-                   string=custom_LCM1602; x=59.4mm; y=72.0mm; scale=100; fid=0;
-                   ha:flags {
-                    floater=1
-                   }
-                   rot = 0.000000
-                  }
-                 }
-                 ha:type {
-                  top = 1
-                  doc = 1
-                 }
-                 purpose = assy
-               }
-
-               ha:top-courtyard {
-                lid=3
-                ha:combining {                }
-
-                 li:objects {
-                  ha:line.131966 {
-                   x1=58.7mm; y1=72.0mm; x2=60.1mm; y2=72.0mm; thickness=0.05mm; clearance=0.0;
-                  }
-                  ha:line.131969 {
-                   x1=59.4mm; y1=71.3mm; x2=59.4mm; y2=72.7mm; thickness=0.05mm; clearance=0.0;
-                  }
-                  ha:line.131972 {
-                   x1=18.9mm; y1=53.5mm; x2=99.9mm; y2=53.5mm; thickness=0.05mm; clearance=0.0;
-                  }
-                  ha:line.131975 {
-                   x1=99.9mm; y1=53.5mm; x2=99.9mm; y2=90.5mm; thickness=0.05mm; clearance=0.0;
-                  }
-                  ha:line.131978 {
-                   x1=99.9mm; y1=90.5mm; x2=18.9mm; y2=90.5mm; thickness=0.05mm; clearance=0.0;
-                  }
-                  ha:line.131981 {
-                   x1=18.9mm; y1=90.5mm; x2=18.9mm; y2=53.5mm; thickness=0.05mm; clearance=0.0;
-                  }
-                  ha:arc.131984 {
-                   x=59.4mm; y=72.0mm; width=0.5mm; height=0.5mm; astart=0; adelta=360; thickness=0.05mm; clearance=0.0;
-                  }
-                 }
-                 ha:type {
-                  top = 1
-                  doc = 1
-                 }
-                 purpose = ko.courtyard
-               }
-              }
+             ha:line.132956 {
+              x1=99.5mm; y1=25.68mm; x2=99.5mm; y2=52.8mm; thickness=0.12mm; clearance=0.0;
              }
-              uid = qOQAS+gBEKxWZ1Tchh4AAABK
+             ha:line.132959 {
+              x1=99.5mm; y1=52.8mm; x2=72.38mm; y2=52.8mm; thickness=0.12mm; clearance=0.0;
              }
-              ha:subc.132943 {
-               ha:attributes {
-                value=OLED
-                footprint=custom_OLED0.96.lht
-                refdes=U5
-               }
-              ha:data {
-                            li:padstack_prototypes {
-
-               ha:ps_proto_v6.0 {
-                 hdia=1.0mm; hplated=1; htop=0; hbottom=0;
-                 li:shape {
-
-                   ha:ps_shape_v4 {
-                    ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;                    }
-                    ha:combining {                    }
-                    ha:layer_mask {
-                     copper = 1
-                     top = 1
-                    }
-                    clearance=0.2mm
-                   }
-
-                   ha:ps_shape_v4 {
-                    ha:ps_circ { x=0.0; y=0.0; dia=1.85mm;                    }
-                    ha:combining { sub=1; auto=1;                    }
-                    ha:layer_mask {
-                     top = 1
-                     mask = 1
-                    }
-                    clearance=0.0
-                   }
-
-                   ha:ps_shape_v4 {
-                    ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;                    }
-                    ha:combining {                    }
-                    ha:layer_mask {
-                     copper = 1
-                     intern = 1
-                    }
-                    clearance=0.2mm
-                   }
-
-                   ha:ps_shape_v4 {
-                    ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;                    }
-                    ha:combining {                    }
-                    ha:layer_mask {
-                     bottom = 1
-                     copper = 1
-                    }
-                    clearance=0.2mm
-                   }
-
-                   ha:ps_shape_v4 {
-                    ha:ps_circ { x=0.0; y=0.0; dia=1.85mm;                    }
-                    ha:combining { sub=1; auto=1;                    }
-                    ha:layer_mask {
-                     bottom = 1
-                     mask = 1
-                    }
-                    clearance=0.0
-                   }
-                 }
-               }
-
-               ha:ps_proto_v6.1 {
-                 hdia=2.8mm; hplated=0; htop=0; hbottom=0;
-                 li:shape {
-
-                   ha:ps_shape_v4 {
-                    ha:ps_circ { x=0.0; y=0.0; dia=2.8mm;                    }
-                    ha:combining {                    }
-                    ha:layer_mask {
-                     copper = 1
-                     top = 1
-                    }
-                    clearance=0.2mm
-                   }
-
-                   ha:ps_shape_v4 {
-                    ha:ps_circ { x=0.0; y=0.0; dia=2.85mm;                    }
-                    ha:combining { sub=1; auto=1;                    }
-                    ha:layer_mask {
-                     top = 1
-                     mask = 1
-                    }
-                    clearance=0.0
-                   }
-
-                   ha:ps_shape_v4 {
-                    ha:ps_circ { x=0.0; y=0.0; dia=2.8mm;                    }
-                    ha:combining {                    }
-                    ha:layer_mask {
-                     copper = 1
-                     intern = 1
-                    }
-                    clearance=0.2mm
-                   }
-
-                   ha:ps_shape_v4 {
-                    ha:ps_circ { x=0.0; y=0.0; dia=2.8mm;                    }
-                    ha:combining {                    }
-                    ha:layer_mask {
-                     bottom = 1
-                     copper = 1
-                    }
-                    clearance=0.2mm
-                   }
-
-                   ha:ps_shape_v4 {
-                    ha:ps_circ { x=0.0; y=0.0; dia=2.85mm;                    }
-                    ha:combining { sub=1; auto=1;                    }
-                    ha:layer_mask {
-                     bottom = 1
-                     mask = 1
-                    }
-                    clearance=0.0
-                   }
-                 }
-               }
+             ha:line.132962 {
+              x1=72.38mm; y1=52.8mm; x2=72.38mm; y2=25.68mm; thickness=0.12mm; clearance=0.0;
+             }
+             ha:text.132965 {
+              string=%a.parent.refdes%; x=69.64mm; y=51.44mm; scale=100; fid=0;
+              ha:flags {
+               dyntext=1
+               floater=1
               }
+              rot = 0.000000
+             }
+            }
+            ha:type {
+             silk = 1
+             top = 1
+            }
+          }
 
-               li:objects {
-                ha:padstack_ref.132998 {
-                 proto=0; x=82.13mm; y=27.24mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                 ha:flags {
-                  clearline=1
-                 }
+          ha:top-assembly {
+           lid=2
+           ha:combining {           }
 
-                 li:thermal {
-                   li:1 {
-                    on  
-                    diag  
-                    round  
-                    noshape  
-                   }
-                   li:2 {
-                    on  
-                    diag  
-                    round  
-                    noshape  
-                   }
-                   li:3 {
-                    on  
-                    diag  
-                    round  
-                    noshape  
-                   }
-                 }
-
-                 ha:attributes {
-                   term=1
-                   name=1
-                 }
-                }
-                ha:padstack_ref.132999 {
-                 proto=0; x=84.67mm; y=27.24mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                 ha:flags {
-                  clearline=1
-                 }
-
-                 li:thermal {
-                 }
-
-                 ha:attributes {
-                   term=2
-                   name=2
-                 }
-                }
-                ha:padstack_ref.133000 {
-                 proto=0; x=87.21mm; y=27.24mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                 ha:flags {
-                  clearline=1
-                 }
-
-                 li:thermal {
-                 }
-
-                 ha:attributes {
-                   term=3
-                   name=3
-                 }
-                }
-                ha:padstack_ref.133001 {
-                 proto=0; x=89.75mm; y=27.24mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                 ha:flags {
-                  clearline=1
-                 }
-
-                 li:thermal {
-                 }
-
-                 ha:attributes {
-                   term=4
-                   name=4
-                 }
-                }
-                ha:padstack_ref.133002 {
-                 proto=1; x=75.69mm; y=27.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                 ha:flags {
-                  clearline=1
-                 }
-
-                 li:thermal {
-                 }
-
-                 ha:attributes {
-                   term=MH1
-                   name=MH1
-                 }
-                }
-                ha:padstack_ref.133003 {
-                 proto=1; x=96.19mm; y=27.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                 ha:flags {
-                  clearline=1
-                 }
-
-                 li:thermal {
-                 }
-
-                 ha:attributes {
-                   term=MH2
-                   name=MH2
-                 }
-                }
-                ha:padstack_ref.133004 {
-                 proto=1; x=75.69mm; y=50.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                 ha:flags {
-                  clearline=1
-                 }
-
-                 li:thermal {
-                 }
-
-                 ha:attributes {
-                   term=MH3
-                   name=MH3
-                 }
-                }
-                ha:padstack_ref.133005 {
-                 proto=1; x=96.19mm; y=50.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                 ha:flags {
-                  clearline=1
-                 }
-
-                 li:thermal {
-                 }
-
-                 ha:attributes {
-                   term=MH4
-                   name=MH4
-                 }
-                }
-                ha:padstack_ref.133006 {
-                 proto=1; x=74.79mm; y=27.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                 ha:flags {
-                  clearline=1
-                 }
-
-                 li:thermal {
-                 }
-
-                 ha:attributes {
-                   term=MH5
-                   name=MH5
-                 }
-                }
-                ha:padstack_ref.133007 {
-                 proto=1; x=97.09mm; y=27.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                 ha:flags {
-                  clearline=1
-                 }
-
-                 li:thermal {
-                 }
-
-                 ha:attributes {
-                   term=MH6
-                   name=MH6
-                 }
-                }
-                ha:padstack_ref.133008 {
-                 proto=1; x=74.79mm; y=50.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                 ha:flags {
-                  clearline=1
-                 }
-
-                 li:thermal {
-                 }
-
-                 ha:attributes {
-                   term=MH7
-                   name=MH7
-                 }
-                }
-                ha:padstack_ref.133009 {
-                 proto=1; x=97.09mm; y=50.74mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                 ha:flags {
-                  clearline=1
-                 }
-
-                 li:thermal {
-                 }
-
-                 ha:attributes {
-                   term=MH8
-                   name=MH8
-                 }
-                }
-               }
-               li:layers {
-
-                ha:subc-aux {
-                 lid=0
-                 ha:combining {                 }
-
-                  li:objects {
-                   ha:line.132944 {
-                    x1=85.94mm; y1=39.24mm; x2=85.94mm; y2=39.24mm; thickness=0.1mm; clearance=0.0;
-                    ha:attributes {
-                      subc-role=origin
-                    }
-                   }
-                   ha:line.132947 {
-                    x1=85.94mm; y1=39.24mm; x2=86.94mm; y2=39.24mm; thickness=0.1mm; clearance=0.0;
-                    ha:attributes {
-                      subc-role=x
-                    }
-                   }
-                   ha:line.132950 {
-                    x1=85.94mm; y1=39.24mm; x2=85.94mm; y2=40.24mm; thickness=0.1mm; clearance=0.0;
-                    ha:attributes {
-                      subc-role=y
-                    }
-                   }
-                  }
-                  ha:type {
-                   top = 1
-                   misc = 1
-                   virtual = 1
-                  }
-                }
-
-                ha:top-silkscreen {
-                 lid=1
-                 ha:combining {                 }
-
-                  li:objects {
-                   ha:line.132953 {
-                    x1=72.38mm; y1=25.68mm; x2=99.5mm; y2=25.68mm; thickness=0.12mm; clearance=0.0;
-                   }
-                   ha:line.132956 {
-                    x1=99.5mm; y1=25.68mm; x2=99.5mm; y2=52.8mm; thickness=0.12mm; clearance=0.0;
-                   }
-                   ha:line.132959 {
-                    x1=99.5mm; y1=52.8mm; x2=72.38mm; y2=52.8mm; thickness=0.12mm; clearance=0.0;
-                   }
-                   ha:line.132962 {
-                    x1=72.38mm; y1=52.8mm; x2=72.38mm; y2=25.68mm; thickness=0.12mm; clearance=0.0;
-                   }
-                   ha:text.132965 {
-                    string=%a.parent.refdes%; x=85.94mm; y=39.24mm; scale=100; fid=0;
-                    ha:flags {
-                     dyntext=1
-                     floater=1
-                    }
-                    rot = 0.000000
-                   }
-                  }
-                  ha:type {
-                   silk = 1
-                   top = 1
-                  }
-                }
-
-                ha:top-assembly {
-                 lid=2
-                 ha:combining {                 }
-
-                  li:objects {
-                   ha:line.132966 {
-                    x1=2.8519685in; y1=25.74mm; x2=99.44mm; y2=25.74mm; thickness=0.1mm; clearance=0.0;
-                   }
-                   ha:line.132969 {
-                    x1=99.44mm; y1=25.74mm; x2=99.44mm; y2=52.74mm; thickness=0.1mm; clearance=0.0;
-                   }
-                   ha:line.132972 {
-                    x1=99.44mm; y1=52.74mm; x2=2.8519685in; y2=52.74mm; thickness=0.1mm; clearance=0.0;
-                   }
-                   ha:line.132975 {
-                    x1=2.8519685in; y1=52.74mm; x2=2.8519685in; y2=25.74mm; thickness=0.1mm; clearance=0.0;
-                   }
-                   ha:text.132978 {
-                    string=custom_OLED0.96; x=85.94mm; y=39.24mm; scale=100; fid=0;
-                    ha:flags {
-                     floater=1
-                    }
-                    rot = 0.000000
-                   }
-                  }
-                  ha:type {
-                   top = 1
-                   doc = 1
-                  }
-                  purpose = assy
-                }
-
-                ha:top-courtyard {
-                 lid=3
-                 ha:combining {                 }
-
-                  li:objects {
-                   ha:line.132979 {
-                    x1=85.24mm; y1=39.24mm; x2=86.64mm; y2=39.24mm; thickness=0.05mm; clearance=0.0;
-                   }
-                   ha:line.132982 {
-                    x1=85.94mm; y1=38.54mm; x2=85.94mm; y2=39.94mm; thickness=0.05mm; clearance=0.0;
-                   }
-                   ha:line.132985 {
-                    x1=71.94mm; y1=993.7007874mil; x2=99.94mm; y2=993.7007874mil; thickness=0.05mm; clearance=0.0;
-                   }
-                   ha:line.132988 {
-                    x1=99.94mm; y1=993.7007874mil; x2=99.94mm; y2=53.24mm; thickness=0.05mm; clearance=0.0;
-                   }
-                   ha:line.132991 {
-                    x1=99.94mm; y1=53.24mm; x2=71.94mm; y2=53.24mm; thickness=0.05mm; clearance=0.0;
-                   }
-                   ha:line.132994 {
-                    x1=71.94mm; y1=53.24mm; x2=71.94mm; y2=993.7007874mil; thickness=0.05mm; clearance=0.0;
-                   }
-                   ha:arc.132997 {
-                    x=85.94mm; y=39.24mm; width=0.5mm; height=0.5mm; astart=0; adelta=360; thickness=0.05mm; clearance=0.0;
-                   }
-                  }
-                  ha:type {
-                   top = 1
-                   doc = 1
-                  }
-                  purpose = ko.courtyard
-                }
-               }
+            li:objects {
+             ha:line.132966 {
+              x1=2.8519685in; y1=25.74mm; x2=99.44mm; y2=25.74mm; thickness=0.1mm; clearance=0.0;
+             }
+             ha:line.132969 {
+              x1=99.44mm; y1=25.74mm; x2=99.44mm; y2=52.74mm; thickness=0.1mm; clearance=0.0;
+             }
+             ha:line.132972 {
+              x1=99.44mm; y1=52.74mm; x2=2.8519685in; y2=52.74mm; thickness=0.1mm; clearance=0.0;
+             }
+             ha:line.132975 {
+              x1=2.8519685in; y1=52.74mm; x2=2.8519685in; y2=25.74mm; thickness=0.1mm; clearance=0.0;
+             }
+             ha:text.132978 {
+              string=OLED; x=84.24mm; y=36.54mm; scale=100; fid=0;
+              ha:flags {
+               floater=1
               }
-               uid = qOQAS+gBEKxWZ1Tchh4AAABS
-              }
-               ha:subc.133268 {
-                ha:attributes {
-                 value=BAT_EXT
-                 footprint=custom_XH-2.54-2P.lht
-                 refdes=B1
-                }
-               ha:data {
-                              li:padstack_prototypes {
+              rot = 0.000000
+             }
+            }
+            ha:type {
+             top = 1
+             doc = 1
+            }
+            purpose = assy
+          }
 
-                ha:ps_proto_v6.0 {
-                  hdia=1.0mm; hplated=1; htop=0; hbottom=0;
-                  li:shape {
+          ha:top-courtyard {
+           lid=3
+           ha:combining {           }
 
-                    ha:ps_shape_v4 {
-                     ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;                     }
-                     ha:combining {                     }
-                     ha:layer_mask {
-                      copper = 1
-                      top = 1
-                     }
-                     clearance=0.2mm
-                    }
+            li:objects {
+             ha:line.132979 {
+              x1=85.24mm; y1=39.24mm; x2=86.64mm; y2=39.24mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.132982 {
+              x1=85.94mm; y1=38.54mm; x2=85.94mm; y2=39.94mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.132985 {
+              x1=71.94mm; y1=993.7007874mil; x2=99.94mm; y2=993.7007874mil; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.132988 {
+              x1=99.94mm; y1=993.7007874mil; x2=99.94mm; y2=53.24mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.132991 {
+              x1=99.94mm; y1=53.24mm; x2=71.94mm; y2=53.24mm; thickness=0.05mm; clearance=0.0;
+             }
+             ha:line.132994 {
+              x1=71.94mm; y1=53.24mm; x2=71.94mm; y2=993.7007874mil; thickness=0.05mm; clearance=0.0;
+             }
+             ha:arc.132997 {
+              x=85.94mm; y=39.24mm; width=0.5mm; height=0.5mm; astart=0; adelta=360; thickness=0.05mm; clearance=0.0;
+             }
+            }
+            ha:type {
+             top = 1
+             doc = 1
+            }
+            purpose = ko.courtyard
+          }
+         }
+        }
+         uid = qOQAS+gBEKxWZ1Tchh4AAABS
+        }
+       ha:subc.9448 {
+        ha:attributes {
+         value=BAT_18650
+         footprint=custom_18650_HOLDER.lht
+         refdes=B2
+        }
+       ha:data {
+              li:padstack_prototypes {
 
-                    ha:ps_shape_v4 {
-                     ha:ps_circ { x=0.0; y=0.0; dia=1.85mm;                     }
-                     ha:combining { sub=1; auto=1;                     }
-                     ha:layer_mask {
-                      top = 1
-                      mask = 1
-                     }
-                     clearance=0.0
-                    }
+        ha:ps_proto_v6.0 {
+          hdia=2.4mm; hplated=1; htop=0; hbottom=0;
+          li:shape {
 
-                    ha:ps_shape_v4 {
-                     ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;                     }
-                     ha:combining {                     }
-                     ha:layer_mask {
-                      copper = 1
-                      intern = 1
-                     }
-                     clearance=0.2mm
-                    }
+            ha:ps_shape_v4 {
+             ha:ps_circ { x=0.0; y=0.0; dia=3.0mm;             }
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              top = 1
+             }
+             clearance=0.2mm
+            }
 
-                    ha:ps_shape_v4 {
-                     ha:ps_circ { x=0.0; y=0.0; dia=1.8mm;                     }
-                     ha:combining {                     }
-                     ha:layer_mask {
-                      bottom = 1
-                      copper = 1
-                     }
-                     clearance=0.2mm
-                    }
+            ha:ps_shape_v4 {
+             ha:ps_circ { x=0.0; y=0.0; dia=3.05mm;             }
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              top = 1
+              mask = 1
+             }
+             clearance=0.0
+            }
 
-                    ha:ps_shape_v4 {
-                     ha:ps_circ { x=0.0; y=0.0; dia=1.85mm;                     }
-                     ha:combining { sub=1; auto=1;                     }
-                     ha:layer_mask {
-                      bottom = 1
-                      mask = 1
-                     }
-                     clearance=0.0
-                    }
-                  }
-                }
-               }
+            ha:ps_shape_v4 {
+             ha:ps_circ { x=0.0; y=0.0; dia=3.0mm;             }
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              intern = 1
+             }
+             clearance=0.2mm
+            }
 
-                li:objects {
-                 ha:padstack_ref.133323 {
-                  proto=0; x=93.46mm; y=3.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                  ha:flags {
-                   clearline=1
-                  }
+            ha:ps_shape_v4 {
+             ha:ps_circ { x=0.0; y=0.0; dia=3.0mm;             }
+             ha:combining {             }
+             ha:layer_mask {
+              bottom = 1
+              copper = 1
+             }
+             clearance=0.2mm
+            }
 
-                  li:thermal {
-                  }
+            ha:ps_shape_v4 {
+             ha:ps_circ { x=0.0; y=0.0; dia=3.05mm;             }
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              bottom = 1
+              mask = 1
+             }
+             clearance=0.0
+            }
+          }
+        }
 
-                  ha:attributes {
-                    term=1
-                    name=1
-                  }
-                 }
-                 ha:padstack_ref.133324 {
-                  proto=0; x=96.0mm; y=3.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-                  ha:flags {
-                   clearline=1
-                  }
+        ha:ps_proto_v6.1 {
+          hdia=3.2mm; hplated=0; htop=0; hbottom=0;
+          li:shape {
 
-                  li:thermal {
-                    li:2 {
-                     on  
-                     diag  
-                     round  
-                     noshape  
-                    }
-                    li:3 {
-                     on  
-                     diag  
-                     round  
-                     noshape  
-                    }
-                  }
+            ha:ps_shape_v4 {
+             ha:ps_circ { x=0.0; y=0.0; dia=3.2mm;             }
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              top = 1
+             }
+             clearance=0.2mm
+            }
 
-                  ha:attributes {
-                    term=2
-                    name=2
-                  }
-                 }
-                }
-                li:layers {
+            ha:ps_shape_v4 {
+             ha:ps_circ { x=0.0; y=0.0; dia=3.25mm;             }
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              top = 1
+              mask = 1
+             }
+             clearance=0.0
+            }
 
-                 ha:subc-aux {
-                  lid=0
-                  ha:combining {                  }
+            ha:ps_shape_v4 {
+             ha:ps_circ { x=0.0; y=0.0; dia=3.2mm;             }
+             ha:combining {             }
+             ha:layer_mask {
+              copper = 1
+              intern = 1
+             }
+             clearance=0.2mm
+            }
 
-                   li:objects {
-                    ha:line.133269 {
-                     x1=94.73mm; y1=3.425mm; x2=94.73mm; y2=3.425mm; thickness=0.1mm; clearance=0.0;
-                     ha:attributes {
-                       subc-role=origin
-                     }
-                    }
-                    ha:line.133272 {
-                     x1=94.73mm; y1=3.425mm; x2=95.73mm; y2=3.425mm; thickness=0.1mm; clearance=0.0;
-                     ha:attributes {
-                       subc-role=x
-                     }
-                    }
-                    ha:line.133275 {
-                     x1=94.73mm; y1=3.425mm; x2=94.73mm; y2=4.425mm; thickness=0.1mm; clearance=0.0;
-                     ha:attributes {
-                       subc-role=y
-                     }
-                    }
-                   }
-                   ha:type {
-                    top = 1
-                    misc = 1
-                    virtual = 1
-                   }
-                 }
+            ha:ps_shape_v4 {
+             ha:ps_circ { x=0.0; y=0.0; dia=3.2mm;             }
+             ha:combining {             }
+             ha:layer_mask {
+              bottom = 1
+              copper = 1
+             }
+             clearance=0.2mm
+            }
 
-                 ha:top-silkscreen {
-                  lid=1
-                  ha:combining {                  }
+            ha:ps_shape_v4 {
+             ha:ps_circ { x=0.0; y=0.0; dia=3.25mm;             }
+             ha:combining { sub=1; auto=1;             }
+             ha:layer_mask {
+              bottom = 1
+              mask = 1
+             }
+             clearance=0.0
+            }
+          }
+        }
+       }
 
-                   li:objects {
-                    ha:line.133278 {
-                     x1=90.945mm; y1=0.49mm; x2=98.515mm; y2=0.49mm; thickness=0.12mm; clearance=0.0;
-                    }
-                    ha:line.133281 {
-                     x1=98.515mm; y1=0.49mm; x2=98.515mm; y2=6.36mm; thickness=0.12mm; clearance=0.0;
-                    }
-                    ha:line.133284 {
-                     x1=98.515mm; y1=6.36mm; x2=90.945mm; y2=6.36mm; thickness=0.12mm; clearance=0.0;
-                    }
-                    ha:line.133287 {
-                     x1=90.945mm; y1=6.36mm; x2=90.945mm; y2=0.49mm; thickness=0.12mm; clearance=0.0;
-                    }
-                    ha:text.133290 {
-                     string=%a.parent.refdes%; x=88.03mm; y=0.525mm; scale=100; fid=0;
-                     ha:flags {
-                      dyntext=1
-                      floater=1
-                     }
-                     rot = 0.000000
-                    }
-                   }
-                   ha:type {
-                    silk = 1
-                    top = 1
-                   }
-                 }
+        li:objects {
+         ha:padstack_ref.9503 {
+          proto=0; x=87.255mm; y=11.0mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
+          ha:flags {
+           clearline=1
+          }
 
-                 ha:top-assembly {
-                  lid=2
-                  ha:combining {                  }
+          li:thermal {
+          }
 
-                   li:objects {
-                    ha:line.133291 {
-                     x1=91.005mm; y1=0.55mm; x2=3.8761811in; y2=0.55mm; thickness=0.1mm; clearance=0.0;
-                    }
-                    ha:line.133294 {
-                     x1=3.8761811in; y1=0.55mm; x2=3.8761811in; y2=6.3mm; thickness=0.1mm; clearance=0.0;
-                    }
-                    ha:line.133297 {
-                     x1=3.8761811in; y1=6.3mm; x2=91.005mm; y2=6.3mm; thickness=0.1mm; clearance=0.0;
-                    }
-                    ha:line.133300 {
-                     x1=91.005mm; y1=6.3mm; x2=91.005mm; y2=0.55mm; thickness=0.1mm; clearance=0.0;
-                    }
-                    ha:text.133303 {
-                     string=custom_XH-2.54-2P; x=94.73mm; y=3.425mm; scale=100; fid=0;
-                     ha:flags {
-                      floater=1
-                     }
-                     rot = 0.000000
-                    }
-                   }
-                   ha:type {
-                    top = 1
-                    doc = 1
-                   }
-                   purpose = assy
-                 }
+          ha:attributes {
+            term=1
+            name=1
+          }
+         }
+         ha:padstack_ref.9504 {
+          proto=0; x=14.355mm; y=11.0mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
+          ha:flags {
+           clearline=1
+          }
 
-                 ha:top-courtyard {
-                  lid=3
-                  ha:combining {                  }
+          li:thermal {
+            li:2 {
+             on  
+             diag  
+             round  
+             noshape  
+            }
+          }
 
-                   li:objects {
-                    ha:line.133304 {
-                     x1=94.03mm; y1=3.425mm; x2=95.43mm; y2=3.425mm; thickness=0.05mm; clearance=0.0;
-                    }
-                    ha:line.133307 {
-                     x1=94.73mm; y1=2.725mm; x2=94.73mm; y2=4.125mm; thickness=0.05mm; clearance=0.0;
-                    }
-                    ha:line.133310 {
-                     x1=90.505mm; y1=0.05mm; x2=98.955mm; y2=0.05mm; thickness=0.05mm; clearance=0.0;
-                    }
-                    ha:line.133313 {
-                     x1=98.955mm; y1=0.05mm; x2=98.955mm; y2=6.8mm; thickness=0.05mm; clearance=0.0;
-                    }
-                    ha:line.133316 {
-                     x1=98.955mm; y1=6.8mm; x2=90.505mm; y2=6.8mm; thickness=0.05mm; clearance=0.0;
-                    }
-                    ha:line.133319 {
-                     x1=90.505mm; y1=6.8mm; x2=90.505mm; y2=0.05mm; thickness=0.05mm; clearance=0.0;
-                    }
-                    ha:arc.133322 {
-                     x=94.73mm; y=3.425mm; width=0.5mm; height=0.5mm; astart=0; adelta=360; thickness=0.05mm; clearance=0.0;
-                    }
-                   }
-                   ha:type {
-                    top = 1
-                    doc = 1
-                   }
-                   purpose = ko.courtyard
-                 }
-                }
-               }
-                uid = qOQAS+gBEKxWZ1Tchh4AAABU
-               }
+          ha:attributes {
+            term=2
+            name=2
+          }
+         }
+         ha:padstack_ref.9505 {
+          proto=1; x=78.61mm; y=11.0mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
+          ha:flags {
+           clearline=1
+          }
+
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=MH1
+            name=MH1
+          }
+         }
+         ha:padstack_ref.9506 {
+          proto=1; x=23.0mm; y=11.0mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
+          ha:flags {
+           clearline=1
+          }
+
+          li:thermal {
+          }
+
+          ha:attributes {
+            term=MH2
+            name=MH2
+          }
+         }
+        }
+        li:layers {
+
+         ha:subc-aux {
+          lid=0
+          ha:combining {          }
+
+           li:objects {
+            ha:line.9449 {
+             x1=50.805mm; y1=11.0mm; x2=50.805mm; y2=11.0mm; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=origin
+             }
+ ha:flags ={ selected=1
+ };            }
+            ha:line.9452 {
+             x1=50.805mm; y1=11.0mm; x2=49.805mm; y2=11.0mm; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=x
+             }
+ ha:flags ={ selected=1
+ };            }
+            ha:line.9455 {
+             x1=50.805mm; y1=11.0mm; x2=50.805mm; y2=10.0mm; thickness=0.1mm; clearance=0.0;
+             ha:attributes {
+               subc-role=y
+             }
+ ha:flags ={ selected=1
+ };            }
+           }
+           ha:type {
+            top = 1
+            misc = 1
+            virtual = 1
+           }
+         }
+
+         ha:top-silkscreen {
+          lid=1
+          ha:combining {          }
+
+           li:objects {
+            ha:line.9458 {
+             x1=89.715mm; y1=21.51mm; x2=11.895mm; y2=21.51mm; thickness=0.12mm; clearance=0.0;
+            }
+            ha:line.9461 {
+             x1=11.895mm; y1=21.51mm; x2=11.895mm; y2=0.49mm; thickness=0.12mm; clearance=0.0;
+            }
+            ha:line.9464 {
+             x1=11.895mm; y1=0.49mm; x2=89.715mm; y2=0.49mm; thickness=0.12mm; clearance=0.0;
+            }
+            ha:line.9467 {
+             x1=89.715mm; y1=0.49mm; x2=89.715mm; y2=21.51mm; thickness=0.12mm; clearance=0.0;
+            }
+            ha:text.9470 {
+             string=%a.parent.refdes%; x=9.405mm; y=0.2mm; scale=100; fid=0;
+             ha:flags {
+              clearline=1
+              dyntext=1
+              floater=1
+             }
+             rot = 360.000000
+            }
+           }
+           ha:type {
+            silk = 1
+            top = 1
+           }
+         }
+
+         ha:top-assembly {
+          lid=2
+          ha:combining {          }
+
+           li:objects {
+            ha:line.9471 {
+             x1=89.655mm; y1=21.45mm; x2=11.955mm; y2=21.45mm; thickness=0.1mm; clearance=0.0;
+            }
+            ha:line.9474 {
+             x1=11.955mm; y1=21.45mm; x2=11.955mm; y2=0.55mm; thickness=0.1mm; clearance=0.0;
+            }
+            ha:line.9477 {
+             x1=11.955mm; y1=0.55mm; x2=89.655mm; y2=0.55mm; thickness=0.1mm; clearance=0.0;
+            }
+            ha:line.9480 {
+             x1=89.655mm; y1=0.55mm; x2=89.655mm; y2=21.45mm; thickness=0.1mm; clearance=0.0;
+            }
+            ha:text.9483 {
+             string=BAT_18650; x=47.095mm; y=8.4mm; scale=100; fid=0;
+             ha:flags {
+              clearline=1
+              floater=1
+             }
+             rot = 360.000000
+            }
+           }
+           ha:type {
+            top = 1
+            doc = 1
+           }
+           purpose = assy
+         }
+
+         ha:top-courtyard {
+          lid=3
+          ha:combining {          }
+
+           li:objects {
+            ha:line.9484 {
+             x1=51.505mm; y1=11.0mm; x2=50.105mm; y2=11.0mm; thickness=0.05mm; clearance=0.0;
+            }
+            ha:line.9487 {
+             x1=50.805mm; y1=11.7mm; x2=50.805mm; y2=10.3mm; thickness=0.05mm; clearance=0.0;
+            }
+            ha:line.9490 {
+             x1=90.155mm; y1=21.95mm; x2=11.455mm; y2=21.95mm; thickness=0.05mm; clearance=0.0;
+            }
+            ha:line.9493 {
+             x1=11.455mm; y1=21.95mm; x2=11.455mm; y2=0.05mm; thickness=0.05mm; clearance=0.0;
+            }
+            ha:line.9496 {
+             x1=11.455mm; y1=0.05mm; x2=90.155mm; y2=0.05mm; thickness=0.05mm; clearance=0.0;
+            }
+            ha:line.9499 {
+             x1=90.155mm; y1=0.05mm; x2=90.155mm; y2=21.95mm; thickness=0.05mm; clearance=0.0;
+            }
+            ha:arc.9502 {
+             x=50.805mm; y=11.0mm; width=0.5mm; height=0.5mm; astart=180; adelta=360; thickness=0.05mm; clearance=0.0;
+            }
+           }
+           ha:type {
+            top = 1
+            doc = 1
+           }
+           purpose = ko.courtyard
+         }
+        }
+       }
+        uid = JJDgnKyWHxEMTxRxi5sAAABA
+       }
    }
    li:layers {
 
@@ -45401,10 +45361,10 @@ ha:pcb-rnd-board-v6 {
      grid_unit = mm
      ha:view {
       flip_x = 0
-      flip_y = 1
+      flip_y = 0
      }
       buffer_number = 0
-      show_solder_side = 1
+      show_solder_side = 0
       grids_idx = 9
       grid = 100.00 um
        clear_line = true