update version number for release, use AT1220-only beeper footprint, new 1170 source...
[hw/telelco] / telelco.lht
index a1a5709c5b458213d3f2f20185d3411b4ad00128..ee92622f2943fd3c39eca4c6c138479f6bf7b248 100644 (file)
@@ -697,7 +697,7 @@ ha:pcb-rnd-board-v5 {
       }
      }
      ha:padstack_ref.64376 {
-      proto=0; x=42.799mm; y=2.803in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+      proto=0; x=42.799mm; y=2.703in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
       ha:flags {
        clearline=1
       }
@@ -715,7 +715,7 @@ ha:pcb-rnd-board-v5 {
       }
      }
      ha:padstack_ref.64555 {
-      proto=0; x=41.783mm; y=2.803in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+      proto=0; x=41.783mm; y=2.702in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
       ha:flags {
        clearline=1
       }
@@ -1031,15 +1031,6 @@ ha:pcb-rnd-board-v5 {
       li:thermal {
       }
      }
-     ha:padstack_ref.93919 {
-      proto=0; x=1.423in; y=1.628in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-      ha:flags {
-       clearline=1
-      }
-
-      li:thermal {
-      }
-     }
      ha:padstack_ref.94023 {
       proto=0; x=1.561in; y=1.876in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
       ha:flags {
@@ -1094,42 +1085,6 @@ ha:pcb-rnd-board-v5 {
       li:thermal {
       }
      }
-     ha:padstack_ref.97628 {
-      proto=0; x=1.253in; y=1.656in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-      ha:flags {
-       clearline=1
-      }
-
-      li:thermal {
-      }
-     }
-     ha:padstack_ref.97674 {
-      proto=0; x=945.0mil; y=42.291mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-      ha:flags {
-       clearline=1
-      }
-
-      li:thermal {
-      }
-     }
-     ha:padstack_ref.97687 {
-      proto=0; x=972.0mil; y=1.634in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-      ha:flags {
-       clearline=1
-      }
-
-      li:thermal {
-      }
-     }
-     ha:padstack_ref.97697 {
-      proto=0; x=999.0mil; y=1.603in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-      ha:flags {
-       clearline=1
-      }
-
-      li:thermal {
-      }
-     }
      ha:padstack_ref.97767 {
       proto=0; x=1.644in; y=1.919in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
       ha:flags {
@@ -1183,6 +1138,24 @@ ha:pcb-rnd-board-v5 {
       li:thermal {
       }
      }
+     ha:padstack_ref.137241 {
+      proto=0; x=1.363in; y=1.761in; rot=0.000000; xmirror=0; smirror=0; clearance=6.0mil;
+      ha:flags {
+       clearline=1
+      }
+
+      li:thermal {
+      }
+     }
+     ha:padstack_ref.140447 {
+      proto=0; x=688.0mil; y=1.58in; rot=0.000000; xmirror=0; smirror=0; clearance=6.0mil;
+      ha:flags {
+       clearline=1
+      }
+
+      li:thermal {
+      }
+     }
      ha:subc.142 {
       ha:attributes {
        {io_pcb::hidename_y}=2.3368 mm
@@ -1192,6 +1165,7 @@ ha:pcb-rnd-board-v5 {
        value=
        {io_pcb::hidename_direction}=0
        {io_pcb::hidename_x}=2.2352 mm
+        device=HOLE_PLATED
       }
      ha:data {
           li:padstack_prototypes {
@@ -1344,6 +1318,7 @@ ha:pcb-rnd-board-v5 {
        value=
        {io_pcb::hidename_direction}=0
        {io_pcb::hidename_x}=56.0324 mm
+        device=HOLE_PLATED
       }
      ha:data {
           li:padstack_prototypes {
@@ -1496,6 +1471,7 @@ ha:pcb-rnd-board-v5 {
        value=
        {io_pcb::hidename_direction}=0
        {io_pcb::hidename_x}=2.5146 mm
+        device=HOLE_PLATED
       }
      ha:data {
           li:padstack_prototypes {
@@ -1648,6 +1624,7 @@ ha:pcb-rnd-board-v5 {
        value=
        {io_pcb::hidename_direction}=0
        {io_pcb::hidename_x}=110.1090 mm
+        device=HOLE_PLATED
       }
      ha:data {
           li:padstack_prototypes {
@@ -1800,6 +1777,7 @@ ha:pcb-rnd-board-v5 {
        value=
        {io_pcb::hidename_direction}=0
        {io_pcb::hidename_x}=110.6424 mm
+        device=HOLE_PLATED
       }
      ha:data {
           li:padstack_prototypes {
@@ -1952,6 +1930,7 @@ ha:pcb-rnd-board-v5 {
        value=
        {io_pcb::hidename_direction}=0
        {io_pcb::hidename_x}=56.4642 mm
+        device=HOLE_PLATED
       }
      ha:data {
           li:padstack_prototypes {
@@ -2104,6 +2083,7 @@ ha:pcb-rnd-board-v5 {
        value=LiPo
        {io_pcb::hidename_direction}=0
        {io_pcb::hidename_x}=0.2715 mm
+        device=CONNECTOR
       }
      ha:data {
           li:padstack_prototypes {
@@ -2372,10 +2352,11 @@ ha:pcb-rnd-board-v5 {
        {io_pcb::hidename_y}=3.4544 mm
        footprint=0-215079-4
        {io_pcb::hidename_scale}=100
-       refdes=J3
+       refdes=J5
        value=Debug
        {io_pcb::hidename_direction}=0
        {io_pcb::hidename_x}=34.4424 mm
+        device=CONNECTOR
       }
      ha:data {
           li:padstack_prototypes {
@@ -2746,6 +2727,7 @@ ha:pcb-rnd-board-v5 {
        value=360
        {io_pcb::hidename_direction}=0
        {io_pcb::hidename_x}=51.9039 mm
+        device=RESISTOR
       }
      ha:data {
           li:padstack_prototypes {
@@ -2895,6 +2877,7 @@ ha:pcb-rnd-board-v5 {
        value=140
        {io_pcb::hidename_direction}=0
        {io_pcb::hidename_x}=46.2473 mm
+        device=RESISTOR
       }
      ha:data {
           li:padstack_prototypes {
@@ -3044,6 +3027,7 @@ ha:pcb-rnd-board-v5 {
        value=360
        {io_pcb::hidename_direction}=0
        {io_pcb::hidename_x}=89.4370 mm
+        device=RESISTOR
       }
      ha:data {
           li:padstack_prototypes {
@@ -3193,6 +3177,7 @@ ha:pcb-rnd-board-v5 {
        value=1uF
        {io_pcb::hidename_direction}=3
        {io_pcb::hidename_x}=54.8503 mm
+        device=CAPACITOR
       }
      ha:data {
           li:padstack_prototypes {
@@ -3342,6 +3327,7 @@ ha:pcb-rnd-board-v5 {
         value=bead
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=53.3461 mm
+         device=INDUCTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -3491,6 +3477,7 @@ ha:pcb-rnd-board-v5 {
         value=0.1uF
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=40.2143 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -3640,6 +3627,7 @@ ha:pcb-rnd-board-v5 {
         value=0.1uF
         {io_pcb::hidename_direction}=0
         {io_pcb::hidename_x}=61.7428 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -3789,6 +3777,7 @@ ha:pcb-rnd-board-v5 {
         value=0.1uF
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=60.0517 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -3938,6 +3927,7 @@ ha:pcb-rnd-board-v5 {
         value=0.1uF
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=45.3837 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -4087,6 +4077,7 @@ ha:pcb-rnd-board-v5 {
         value=360
         {io_pcb::hidename_direction}=0
         {io_pcb::hidename_x}=48.9519 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -4236,6 +4227,7 @@ ha:pcb-rnd-board-v5 {
         value=Header-5
         {io_pcb::hidename_direction}=2
         {io_pcb::hidename_x}=40.0050 mm
+         device=CONNECTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -4565,6 +4557,7 @@ ha:pcb-rnd-board-v5 {
         value=1k
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=107.2764 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -4714,6 +4707,7 @@ ha:pcb-rnd-board-v5 {
         value=1k
         {io_pcb::hidename_direction}=2
         {io_pcb::hidename_x}=105.1240 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -4784,7 +4778,7 @@ ha:pcb-rnd-board-v5 {
 
        li:objects {
         ha:padstack_ref.534 {
-         proto=0; x=3.987in; y=3.09774in; rot=90.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=3.99526in; y=3.064in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -4798,7 +4792,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.535 {
-         proto=0; x=3.987in; y=3.06626in; rot=90.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=4.02674in; y=3.064in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -4820,25 +4814,25 @@ ha:pcb-rnd-board-v5 {
 
           li:objects {
            ha:line.536 {
-            x1=3.987in; y1=78.2828mm; x2=3.987in; y2=78.2828mm; thickness=0.1mm; clearance=0.0;
+            x1=4.011in; y1=3.064in; x2=4.011in; y2=3.064in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
            ha:line.539 {
-            x1=3.987in; y1=78.2828mm; x2=3.987in; y2=78.2828mm; thickness=0.1mm; clearance=0.0;
+            x1=4.011in; y1=3.064in; x2=4.011in; y2=3.064in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
            ha:line.542 {
-            x1=3.987in; y1=78.2828mm; x2=3.987in; y2=77.2828mm; thickness=0.1mm; clearance=0.0;
+            x1=4.011in; y1=3.064in; x2=102.8794mm; y2=3.064in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
            ha:line.545 {
-            x1=3.987in; y1=78.2828mm; x2=102.2698mm; y2=78.2828mm; thickness=0.1mm; clearance=0.0;
+            x1=4.011in; y1=3.064in; x2=4.011in; y2=78.8256mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -4863,6 +4857,7 @@ ha:pcb-rnd-board-v5 {
         value=360
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=47.1297 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -5012,6 +5007,7 @@ ha:pcb-rnd-board-v5 {
         value=360
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=48.4129 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -5082,7 +5078,7 @@ ha:pcb-rnd-board-v5 {
 
        li:objects {
         ha:padstack_ref.564 {
-         proto=0; x=1.08in; y=1.21574in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=1.13in; y=1.16048in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -5096,7 +5092,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.565 {
-         proto=0; x=1.08in; y=1.18426in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=1.13in; y=1.129in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -5118,25 +5114,25 @@ ha:pcb-rnd-board-v5 {
 
           li:objects {
            ha:line.566 {
-            x1=1.08in; y1=30.48mm; x2=1.08in; y2=30.48mm; thickness=0.1mm; clearance=0.0;
+            x1=1.13in; y1=1.14474in; x2=1.13in; y2=1.14474in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
            ha:line.569 {
-            x1=1.08in; y1=30.48mm; x2=1.08in; y2=30.48mm; thickness=0.1mm; clearance=0.0;
+            x1=1.13in; y1=1.14474in; x2=1.13in; y2=1.14474in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
            ha:line.572 {
-            x1=1.08in; y1=30.48mm; x2=1.08in; y2=31.48mm; thickness=0.1mm; clearance=0.0;
+            x1=1.13in; y1=1.14474in; x2=1.13in; y2=30.076396mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
            ha:line.575 {
-            x1=1.08in; y1=30.48mm; x2=28.432mm; y2=30.48mm; thickness=0.1mm; clearance=0.0;
+            x1=1.13in; y1=1.14474in; x2=29.702mm; y2=1.14474in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -5161,6 +5157,7 @@ ha:pcb-rnd-board-v5 {
         value=yellow
         {io_pcb::hidename_direction}=2
         {io_pcb::hidename_x}=46.3550 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -5427,6 +5424,7 @@ ha:pcb-rnd-board-v5 {
         value=yellow
         {io_pcb::hidename_direction}=2
         {io_pcb::hidename_x}=7.4930 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -5591,7 +5589,7 @@ ha:pcb-rnd-board-v5 {
 
        li:objects {
         ha:padstack_ref.598 {
-         proto=0; x=470.0mil; y=125.0mil; rot=0.000000; xmirror=1; smirror=1; clearance=7.5mil;
+         proto=0; x=1.13in; y=125.0mil; rot=0.000000; xmirror=1; smirror=1; clearance=7.5mil;
          ha:flags {
           clearline=1
          }
@@ -5605,7 +5603,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.599 {
-         proto=1; x=370.0mil; y=125.0mil; rot=0.000000; xmirror=1; smirror=1; clearance=7.5mil;
+         proto=1; x=1.03in; y=125.0mil; rot=0.000000; xmirror=1; smirror=1; clearance=7.5mil;
          ha:flags {
           clearline=1
          }
@@ -5632,10 +5630,10 @@ ha:pcb-rnd-board-v5 {
 
           li:objects {
            ha:line.600 {
-            x1=321.0mil; y1=68.0mil; x2=321.0mil; y2=182.0mil; thickness=10.0mil; clearance=0.0;
+            x1=981.0mil; y1=68.0mil; x2=981.0mil; y2=182.0mil; thickness=10.0mil; clearance=0.0;
            }
            ha:arc.603 {
-            x=420.0mil; y=125.0mil; width=114.0mil; height=114.0mil; astart=30.000000; adelta=300.000000; thickness=10.0mil; clearance=0.0;
+            x=1.08in; y=125.0mil; width=114.0mil; height=114.0mil; astart=30.000000; adelta=300.000000; thickness=10.0mil; clearance=0.0;
            }
           }
           ha:type {
@@ -5650,25 +5648,25 @@ ha:pcb-rnd-board-v5 {
 
           li:objects {
            ha:line.604 {
-            x1=420.0mil; y1=125.0mil; x2=420.0mil; y2=125.0mil; thickness=0.1mm; clearance=0.0;
+            x1=1.08in; y1=125.0mil; x2=1.08in; y2=125.0mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
            ha:line.607 {
-            x1=420.0mil; y1=125.0mil; x2=420.0mil; y2=125.0mil; thickness=0.1mm; clearance=0.0;
+            x1=1.08in; y1=125.0mil; x2=1.08in; y2=125.0mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
            ha:line.610 {
-            x1=420.0mil; y1=125.0mil; x2=11.668mm; y2=125.0mil; thickness=0.1mm; clearance=0.0;
+            x1=1.08in; y1=125.0mil; x2=28.432mm; y2=125.0mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
            ha:line.613 {
-            x1=420.0mil; y1=125.0mil; x2=420.0mil; y2=4.175mm; thickness=0.1mm; clearance=0.0;
+            x1=1.08in; y1=125.0mil; x2=1.08in; y2=4.175mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -5693,6 +5691,7 @@ ha:pcb-rnd-board-v5 {
         value=red
         {io_pcb::hidename_direction}=0
         {io_pcb::hidename_x}=106.6800 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -5959,6 +5958,7 @@ ha:pcb-rnd-board-v5 {
         value=green3mm
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=103.4034 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -6220,6 +6220,7 @@ ha:pcb-rnd-board-v5 {
         value=red3mm
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=100.2284 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -6481,6 +6482,7 @@ ha:pcb-rnd-board-v5 {
         value=140
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=12.2301 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -6630,6 +6632,7 @@ ha:pcb-rnd-board-v5 {
         value=140
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=37.1094 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -6779,6 +6782,7 @@ ha:pcb-rnd-board-v5 {
         value=140
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=20.7645 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -6928,6 +6932,7 @@ ha:pcb-rnd-board-v5 {
         value=140
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=28.7782 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -7077,6 +7082,7 @@ ha:pcb-rnd-board-v5 {
         value=140
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=44.0309 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -7226,6 +7232,7 @@ ha:pcb-rnd-board-v5 {
         value=140
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=52.2859 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -7375,6 +7382,7 @@ ha:pcb-rnd-board-v5 {
         value=140
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=60.5409 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -7524,6 +7532,7 @@ ha:pcb-rnd-board-v5 {
         value=140
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=68.7959 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -7673,6 +7682,7 @@ ha:pcb-rnd-board-v5 {
         value=green
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=33.4010 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -7939,6 +7949,7 @@ ha:pcb-rnd-board-v5 {
         value=green
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=25.2984 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -8205,6 +8216,7 @@ ha:pcb-rnd-board-v5 {
         value=green
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=16.9672 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -8471,6 +8483,7 @@ ha:pcb-rnd-board-v5 {
         value=green
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=8.7122 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -8737,6 +8750,7 @@ ha:pcb-rnd-board-v5 {
         value=green
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=68.8340 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -9008,6 +9022,7 @@ ha:pcb-rnd-board-v5 {
         value=green
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=60.5790 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -9279,6 +9294,7 @@ ha:pcb-rnd-board-v5 {
         value=green
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=52.3240 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -9550,6 +9566,7 @@ ha:pcb-rnd-board-v5 {
         value=green
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=44.0690 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -9821,6 +9838,7 @@ ha:pcb-rnd-board-v5 {
         value=yellow
         {io_pcb::hidename_direction}=0
         {io_pcb::hidename_x}=98.4250 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -10087,6 +10105,7 @@ ha:pcb-rnd-board-v5 {
         value=green
         {io_pcb::hidename_direction}=0
         {io_pcb::hidename_x}=90.1700 mm
+         device=LED
        }
       ha:data {
             li:padstack_prototypes {
@@ -10344,77 +10363,22 @@ ha:pcb-rnd-board-v5 {
       }
        uid = 3jbuYMaM0jjDegHZ/p0AAAA4
       }
-      ha:subc.1088 {
+      ha:subc.1156 {
        ha:attributes {
-        {io_pcb::hidename_y}=72.6961 mm
-        footprint=282834-9
+        {io_pcb::hidename_y}=23.9207 mm
+        footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=J2
-        value=9screws
-        {io_pcb::hidename_direction}=0
-        {io_pcb::hidename_x}=61.9999 mm
+        refdes=R51
+        value=140
+        {io_pcb::hidename_direction}=3
+        {io_pcb::hidename_x}=52.9463 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
 
        ha:ps_proto_v4.0 {
-         hdia=45.28mil; hplated=1; htop=0; hbottom=0;
-         li:shape {
-
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;            }
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
-            }
-            clearance=0.0
-           }
-
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;            }
-            ha:combining {            }
-            ha:layer_mask {
-             bottom = 1
-             copper = 1
-            }
-            clearance=0.0
-           }
-
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;            }
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             intern = 1
-            }
-            clearance=0.0
-           }
-
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=83.46mil;            }
-            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=83.46mil;            }
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             bottom = 1
-             mask = 1
-            }
-            clearance=0.0
-           }
-         }
-       }
-
-       ha:ps_proto_v4.1 {
-         hdia=45.28mil; hplated=1; htop=0; hbottom=0;
+         hdia=0.0; hplated=0; htop=0; hbottom=0;
          li:shape {
 
            ha:ps_shape_v4 {
@@ -10425,52 +10389,14 @@ ha:pcb-rnd-board-v5 {
             }
             clearance=0.0
              li:ps_poly {
-              -35.435mil  
-              -35.435mil  
-              35.435mil  
-              -35.435mil  
-              35.435mil  
-              35.435mil  
-              -35.435mil  
-              35.435mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             bottom = 1
-             copper = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -35.435mil  
-              -35.435mil  
-              35.435mil  
-              -35.435mil  
-              35.435mil  
-              35.435mil  
-              -35.435mil  
-              35.435mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             intern = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -35.435mil  
-              -35.435mil  
-              35.435mil  
-              -35.435mil  
-              35.435mil  
-              35.435mil  
-              -35.435mil  
-              35.435mil  
+              -13.77mil  
+              -9.84mil  
+              -13.77mil  
+              9.84mil  
+              13.77mil  
+              9.84mil  
+              13.77mil  
+              -9.84mil  
              }
            }
 
@@ -10482,33 +10408,33 @@ ha:pcb-rnd-board-v5 {
             }
             clearance=0.0
              li:ps_poly {
-              -41.73mil  
-              -41.73mil  
-              41.73mil  
-              -41.73mil  
-              41.73mil  
-              41.73mil  
-              -41.73mil  
-              41.73mil  
+              -16.77mil  
+              -12.84mil  
+              -16.77mil  
+              12.84mil  
+              16.77mil  
+              12.84mil  
+              16.77mil  
+              -12.84mil  
              }
            }
 
            ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
+            ha:combining { auto=1;            }
             ha:layer_mask {
-             bottom = 1
-             mask = 1
+             top = 1
+             paste = 1
             }
             clearance=0.0
              li:ps_poly {
-              -41.73mil  
-              -41.73mil  
-              41.73mil  
-              -41.73mil  
-              41.73mil  
-              41.73mil  
-              -41.73mil  
-              41.73mil  
+              -13.77mil  
+              -9.84mil  
+              -13.77mil  
+              9.84mil  
+              13.77mil  
+              9.84mil  
+              13.77mil  
+              -9.84mil  
              }
            }
          }
@@ -10516,122 +10442,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.1089 {
-         proto=0; x=63.500024mm; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=9
-           name=pin9
-         }
-        }
-        ha:padstack_ref.1090 {
-         proto=0; x=66.040024mm; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-           li:1 {
-            on  
-            diag  
-            round  
-           }
-           li:3 {
-            on  
-            diag  
-            round  
-           }
-         }
-
-         ha:attributes {
-           term=8
-           name=pin8
-         }
-        }
-        ha:padstack_ref.1091 {
-         proto=0; x=68.580024mm; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=7
-           name=pin7
-         }
-        }
-        ha:padstack_ref.1092 {
-         proto=0; x=71.120024mm; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-           li:1 {
-            on  
-            diag  
-            round  
-           }
-           li:3 {
-            on  
-            diag  
-            round  
-           }
-         }
-
-         ha:attributes {
-           term=6
-           name=pin6
-         }
-        }
-        ha:padstack_ref.1093 {
-         proto=0; x=73.660024mm; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=5
-           name=pin5
-         }
-        }
-        ha:padstack_ref.1094 {
-         proto=0; x=76.200024mm; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-           li:1 {
-            on  
-            diag  
-            round  
-           }
-           li:3 {
-            on  
-            diag  
-            round  
-           }
-         }
-
-         ha:attributes {
-           term=4
-           name=pin4
-         }
-        }
-        ha:padstack_ref.1095 {
-         proto=0; x=78.740024mm; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+        ha:padstack_ref.1157 {
+         proto=0; x=741.52mil; y=1.581in; rot=90.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -10640,12 +10452,12 @@ ha:pcb-rnd-board-v5 {
          }
 
          ha:attributes {
-           term=3
-           name=pin3
+           term=1
+           name=1
          }
         }
-        ha:padstack_ref.1096 {
-         proto=0; x=81.280024mm; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+        ha:padstack_ref.1158 {
+         proto=0; x=773.0mil; y=1.581in; rot=90.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -10655,75 +10467,37 @@ ha:pcb-rnd-board-v5 {
 
          ha:attributes {
            term=2
-           name=pin2
-         }
-        }
-        ha:padstack_ref.1097 {
-         proto=1; x=83.820024mm; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=8.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=1
-           name=pin1
+           name=2
          }
         }
        }
        li:layers {
 
-        ha:top-silk {
-         lid=0
-         ha:combining {         }
-
-          li:objects {
-           ha:line.1098 {
-            x1=61.9999mm; y1=72.6961mm; x2=61.9999mm; y2=79.196214mm; thickness=6.0mil; clearance=0.0;
-           }
-           ha:line.1101 {
-            x1=61.9999mm; y1=79.196214mm; x2=85.3199mm; y2=79.196214mm; thickness=6.0mil; clearance=0.0;
-           }
-           ha:line.1104 {
-            x1=85.3199mm; y1=79.196214mm; x2=85.3199mm; y2=72.6961mm; thickness=6.0mil; clearance=0.0;
-           }
-           ha:line.1107 {
-            x1=85.3199mm; y1=72.6961mm; x2=61.9999mm; y2=72.6961mm; thickness=6.0mil; clearance=0.0;
-           }
-          }
-          ha:type {
-           silk = 1
-           top = 1
-          }
-        }
-
         ha:subc-aux {
-         lid=1
+         lid=0
          ha:combining {         }
 
           li:objects {
-           ha:line.1110 {
-            x1=73.660024mm; y1=75.94603mm; x2=73.660024mm; y2=75.94603mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1159 {
+            x1=757.26mil; y1=1.581in; x2=757.26mil; y2=1.581in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.1113 {
-            x1=61.9999mm; y1=72.6961mm; x2=61.9999mm; y2=72.6961mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1162 {
+            x1=757.26mil; y1=1.581in; x2=757.26mil; y2=1.581in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.1116 {
-            x1=61.9999mm; y1=72.6961mm; x2=61.9999mm; y2=71.6961mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1165 {
+            x1=757.26mil; y1=1.581in; x2=18.234404mm; y2=1.581in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.1119 {
-            x1=61.9999mm; y1=72.6961mm; x2=60.9999mm; y2=72.6961mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1168 {
+            x1=757.26mil; y1=1.581in; x2=757.26mil; y2=41.1574mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -10737,135 +10511,192 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAAA5
+       uid = 3jbuYMaM0jjDegHZ/p0AAAA7
       }
-      ha:subc.1122 {
+      ha:subc.1171 {
        ha:attributes {
-        {io_pcb::hidename_y}=72.6961 mm
-        footprint=282834-9
+        {io_pcb::hidename_y}=66.3316 mm
+        footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=J4
-        value=9screws
+        refdes=C7
+        value=4.7uF
         {io_pcb::hidename_direction}=0
-        {io_pcb::hidename_x}=9.4219 mm
+        {io_pcb::hidename_x}=99.7016 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
 
        ha:ps_proto_v4.0 {
-         hdia=45.28mil; hplated=1; htop=0; hbottom=0;
+         hdia=0.0; hplated=0; htop=0; hbottom=0;
          li:shape {
 
            ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;            }
             ha:combining {            }
             ha:layer_mask {
              copper = 1
              top = 1
             }
             clearance=0.0
+             li:ps_poly {
+              -13.77mil  
+              -9.84mil  
+              -13.77mil  
+              9.84mil  
+              13.77mil  
+              9.84mil  
+              13.77mil  
+              -9.84mil  
+             }
            }
 
            ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;            }
-            ha:combining {            }
-            ha:layer_mask {
-             bottom = 1
-             copper = 1
-            }
-            clearance=0.0
-           }
-
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;            }
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             intern = 1
-            }
-            clearance=0.0
-           }
-
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=83.46mil;            }
             ha:combining { sub=1; auto=1;            }
             ha:layer_mask {
              top = 1
              mask = 1
             }
             clearance=0.0
+             li:ps_poly {
+              -16.77mil  
+              -12.84mil  
+              -16.77mil  
+              12.84mil  
+              16.77mil  
+              12.84mil  
+              16.77mil  
+              -12.84mil  
+             }
            }
 
            ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=83.46mil;            }
-            ha:combining { sub=1; auto=1;            }
+            ha:combining { auto=1;            }
             ha:layer_mask {
-             bottom = 1
-             mask = 1
+             top = 1
+             paste = 1
             }
             clearance=0.0
+             li:ps_poly {
+              -13.77mil  
+              -9.84mil  
+              -13.77mil  
+              9.84mil  
+              13.77mil  
+              9.84mil  
+              13.77mil  
+              -9.84mil  
+             }
            }
          }
        }
+      }
 
-       ha:ps_proto_v4.1 {
-         hdia=45.28mil; hplated=1; htop=0; hbottom=0;
-         li:shape {
+       li:objects {
+        ha:padstack_ref.1172 {
+         proto=0; x=4.007in; y=66.675004mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         ha:flags {
+          clearline=1
+         }
 
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=1
+           name=1
+         }
+        }
+        ha:padstack_ref.1173 {
+         proto=0; x=4.007in; y=67.474596mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         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.1174 {
+            x1=101.7778mm; y1=67.0748mm; x2=101.7778mm; y2=67.0748mm; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=pnp-origin
             }
-            clearance=0.0
-             li:ps_poly {
-              -35.435mil  
-              -35.435mil  
-              35.435mil  
-              -35.435mil  
-              35.435mil  
-              35.435mil  
-              -35.435mil  
-              35.435mil  
-             }
            }
-
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             bottom = 1
-             copper = 1
+           ha:line.1177 {
+            x1=101.7778mm; y1=67.0748mm; x2=101.7778mm; y2=67.0748mm; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=origin
+            }
+           }
+           ha:line.1180 {
+            x1=101.7778mm; y1=67.0748mm; x2=101.7778mm; y2=66.0748mm; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=x
+            }
+           }
+           ha:line.1183 {
+            x1=101.7778mm; y1=67.0748mm; x2=100.7778mm; y2=67.0748mm; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=y
             }
-            clearance=0.0
-             li:ps_poly {
-              -35.435mil  
-              -35.435mil  
-              35.435mil  
-              -35.435mil  
-              35.435mil  
-              35.435mil  
-              -35.435mil  
-              35.435mil  
-             }
            }
+          }
+          ha:type {
+           top = 1
+           misc = 1
+           virtual = 1
+          }
+        }
+       }
+      }
+       uid = 3jbuYMaM0jjDegHZ/p0AAAA8
+      }
+      ha:subc.1186 {
+       ha:attributes {
+        {io_pcb::hidename_y}=69.3476 mm
+        footprint=0402
+        {io_pcb::hidename_scale}=100
+        refdes=C6
+        value=4.7uF
+        {io_pcb::hidename_direction}=1
+        {io_pcb::hidename_x}=105.4090 mm
+         device=CAPACITOR
+       }
+      ha:data {
+            li:padstack_prototypes {
+
+       ha:ps_proto_v4.0 {
+         hdia=0.0; hplated=0; htop=0; hbottom=0;
+         li:shape {
 
            ha:ps_shape_v4 {
             ha:combining {            }
             ha:layer_mask {
              copper = 1
-             intern = 1
+             top = 1
             }
             clearance=0.0
              li:ps_poly {
-              -35.435mil  
-              -35.435mil  
-              35.435mil  
-              -35.435mil  
-              35.435mil  
-              35.435mil  
-              -35.435mil  
-              35.435mil  
+              -13.77mil  
+              -9.84mil  
+              -13.77mil  
+              9.84mil  
+              13.77mil  
+              9.84mil  
+              13.77mil  
+              -9.84mil  
              }
            }
 
@@ -10877,33 +10708,33 @@ ha:pcb-rnd-board-v5 {
             }
             clearance=0.0
              li:ps_poly {
-              -41.73mil  
-              -41.73mil  
-              41.73mil  
-              -41.73mil  
-              41.73mil  
-              41.73mil  
-              -41.73mil  
-              41.73mil  
+              -16.77mil  
+              -12.84mil  
+              -16.77mil  
+              12.84mil  
+              16.77mil  
+              12.84mil  
+              16.77mil  
+              -12.84mil  
              }
            }
 
            ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
+            ha:combining { auto=1;            }
             ha:layer_mask {
-             bottom = 1
-             mask = 1
+             top = 1
+             paste = 1
             }
             clearance=0.0
              li:ps_poly {
-              -41.73mil  
-              -41.73mil  
-              41.73mil  
-              -41.73mil  
-              41.73mil  
-              41.73mil  
-              -41.73mil  
-              41.73mil  
+              -13.77mil  
+              -9.84mil  
+              -13.77mil  
+              9.84mil  
+              13.77mil  
+              9.84mil  
+              13.77mil  
+              -9.84mil  
              }
            }
          }
@@ -10911,8 +10742,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.1123 {
-         proto=0; x=430.0mil; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+        ha:padstack_ref.1187 {
+         proto=0; x=106.553mm; y=66.675004mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -10921,637 +10752,12 @@ ha:pcb-rnd-board-v5 {
          }
 
          ha:attributes {
-           term=9
-           name=pin9
+           term=1
+           name=1
          }
         }
-        ha:padstack_ref.1124 {
-         proto=0; x=530.0mil; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-           li:1 {
-            on  
-            diag  
-            round  
-           }
-           li:3 {
-            on  
-            diag  
-            round  
-           }
-         }
-
-         ha:attributes {
-           term=8
-           name=pin8
-         }
-        }
-        ha:padstack_ref.1125 {
-         proto=0; x=630.0mil; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=7
-           name=pin7
-         }
-        }
-        ha:padstack_ref.1126 {
-         proto=0; x=730.0mil; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-           li:1 {
-            on  
-            diag  
-            round  
-           }
-           li:3 {
-            on  
-            diag  
-            round  
-           }
-         }
-
-         ha:attributes {
-           term=6
-           name=pin6
-         }
-        }
-        ha:padstack_ref.1127 {
-         proto=0; x=830.0mil; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=5
-           name=pin5
-         }
-        }
-        ha:padstack_ref.1128 {
-         proto=0; x=930.0mil; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-           li:1 {
-            on  
-            diag  
-            round  
-           }
-           li:3 {
-            on  
-            diag  
-            round  
-           }
-         }
-
-         ha:attributes {
-           term=4
-           name=pin4
-         }
-        }
-        ha:padstack_ref.1129 {
-         proto=0; x=1.03in; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=3
-           name=pin3
-         }
-        }
-        ha:padstack_ref.1130 {
-         proto=0; x=1.13in; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-           li:1 {
-            on  
-            diag  
-            round  
-           }
-           li:3 {
-            on  
-            diag  
-            round  
-           }
-         }
-
-         ha:attributes {
-           term=2
-           name=pin2
-         }
-        }
-        ha:padstack_ref.1131 {
-         proto=1; x=1.23in; y=75.94603mm; rot=0.000000; xmirror=0; smirror=0; clearance=8.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=1
-           name=pin1
-         }
-        }
-       }
-       li:layers {
-
-        ha:top-silk {
-         lid=0
-         ha:combining {         }
-
-          li:objects {
-           ha:line.1132 {
-            x1=9.421876mm; y1=72.6961mm; x2=9.421876mm; y2=79.196214mm; thickness=6.0mil; clearance=0.0;
-           }
-           ha:line.1135 {
-            x1=9.421876mm; y1=79.196214mm; x2=32.741876mm; y2=79.196214mm; thickness=6.0mil; clearance=0.0;
-           }
-           ha:line.1138 {
-            x1=32.741876mm; y1=79.196214mm; x2=32.741876mm; y2=72.6961mm; thickness=6.0mil; clearance=0.0;
-           }
-           ha:line.1141 {
-            x1=32.741876mm; y1=72.6961mm; x2=9.421876mm; y2=72.6961mm; thickness=6.0mil; clearance=0.0;
-           }
-          }
-          ha:type {
-           silk = 1
-           top = 1
-          }
-        }
-
-        ha:subc-aux {
-         lid=1
-         ha:combining {         }
-
-          li:objects {
-           ha:line.1144 {
-            x1=830.0mil; y1=75.94603mm; x2=830.0mil; y2=75.94603mm; thickness=0.1mm; clearance=0.0;
-            ha:flags {
-             selected=1
-            }
-
-            ha:attributes {
-              subc-role=pnp-origin
-            }
-           }
-           ha:line.1147 {
-            x1=9.421876mm; y1=72.6961mm; x2=9.421876mm; y2=72.6961mm; thickness=0.1mm; clearance=0.0;
-            ha:flags {
-             selected=1
-            }
-
-            ha:attributes {
-              subc-role=origin
-            }
-           }
-           ha:line.1150 {
-            x1=9.421876mm; y1=72.6961mm; x2=9.421876mm; y2=71.6961mm; thickness=0.1mm; clearance=0.0;
-            ha:flags {
-             selected=1
-            }
-
-            ha:attributes {
-              subc-role=x
-            }
-           }
-           ha:line.1153 {
-            x1=9.421876mm; y1=72.6961mm; x2=8.421876mm; y2=72.6961mm; thickness=0.1mm; clearance=0.0;
-            ha:flags {
-             selected=1
-            }
-
-            ha:attributes {
-              subc-role=y
-            }
-           }
-          }
-          ha:type {
-           top = 1
-           misc = 1
-           virtual = 1
-          }
-        }
-       }
-      }
-       uid = 3jbuYMaM0jjDegHZ/p0AAAA6
-      }
-      ha:subc.1156 {
-       ha:attributes {
-        {io_pcb::hidename_y}=23.9207 mm
-        footprint=0402
-        {io_pcb::hidename_scale}=100
-        refdes=R51
-        value=140
-        {io_pcb::hidename_direction}=3
-        {io_pcb::hidename_x}=52.9463 mm
-       }
-      ha:data {
-            li:padstack_prototypes {
-
-       ha:ps_proto_v4.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.0
-             li:ps_poly {
-              -13.77mil  
-              -9.84mil  
-              -13.77mil  
-              9.84mil  
-              13.77mil  
-              9.84mil  
-              13.77mil  
-              -9.84mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -16.77mil  
-              -12.84mil  
-              -16.77mil  
-              12.84mil  
-              16.77mil  
-              12.84mil  
-              16.77mil  
-              -12.84mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -13.77mil  
-              -9.84mil  
-              -13.77mil  
-              9.84mil  
-              13.77mil  
-              9.84mil  
-              13.77mil  
-              -9.84mil  
-             }
-           }
-         }
-       }
-      }
-
-       li:objects {
-        ha:padstack_ref.1157 {
-         proto=0; x=520.52mil; y=1.58in; rot=90.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=1
-           name=1
-         }
-        }
-        ha:padstack_ref.1158 {
-         proto=0; x=552.0mil; y=1.58in; rot=90.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         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.1159 {
-            x1=13.621004mm; y1=1.58in; x2=13.621004mm; y2=1.58in; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=pnp-origin
-            }
-           }
-           ha:line.1162 {
-            x1=13.621004mm; y1=1.58in; x2=13.621004mm; y2=1.58in; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=origin
-            }
-           }
-           ha:line.1165 {
-            x1=13.621004mm; y1=1.58in; x2=12.621004mm; y2=1.58in; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=x
-            }
-           }
-           ha:line.1168 {
-            x1=13.621004mm; y1=1.58in; x2=13.621004mm; y2=41.132mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=y
-            }
-           }
-          }
-          ha:type {
-           top = 1
-           misc = 1
-           virtual = 1
-          }
-        }
-       }
-      }
-       uid = 3jbuYMaM0jjDegHZ/p0AAAA7
-      }
-      ha:subc.1171 {
-       ha:attributes {
-        {io_pcb::hidename_y}=66.3316 mm
-        footprint=0402
-        {io_pcb::hidename_scale}=100
-        refdes=C7
-        value=4.7uF
-        {io_pcb::hidename_direction}=0
-        {io_pcb::hidename_x}=99.7016 mm
-       }
-      ha:data {
-            li:padstack_prototypes {
-
-       ha:ps_proto_v4.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.0
-             li:ps_poly {
-              -13.77mil  
-              -9.84mil  
-              -13.77mil  
-              9.84mil  
-              13.77mil  
-              9.84mil  
-              13.77mil  
-              -9.84mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -16.77mil  
-              -12.84mil  
-              -16.77mil  
-              12.84mil  
-              16.77mil  
-              12.84mil  
-              16.77mil  
-              -12.84mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -13.77mil  
-              -9.84mil  
-              -13.77mil  
-              9.84mil  
-              13.77mil  
-              9.84mil  
-              13.77mil  
-              -9.84mil  
-             }
-           }
-         }
-       }
-      }
-
-       li:objects {
-        ha:padstack_ref.1172 {
-         proto=0; x=4.007in; y=66.675004mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=1
-           name=1
-         }
-        }
-        ha:padstack_ref.1173 {
-         proto=0; x=4.007in; y=67.474596mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         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.1174 {
-            x1=101.7778mm; y1=67.0748mm; x2=101.7778mm; y2=67.0748mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=pnp-origin
-            }
-           }
-           ha:line.1177 {
-            x1=101.7778mm; y1=67.0748mm; x2=101.7778mm; y2=67.0748mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=origin
-            }
-           }
-           ha:line.1180 {
-            x1=101.7778mm; y1=67.0748mm; x2=101.7778mm; y2=66.0748mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=x
-            }
-           }
-           ha:line.1183 {
-            x1=101.7778mm; y1=67.0748mm; x2=100.7778mm; y2=67.0748mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=y
-            }
-           }
-          }
-          ha:type {
-           top = 1
-           misc = 1
-           virtual = 1
-          }
-        }
-       }
-      }
-       uid = 3jbuYMaM0jjDegHZ/p0AAAA8
-      }
-      ha:subc.1186 {
-       ha:attributes {
-        {io_pcb::hidename_y}=69.3476 mm
-        footprint=0402
-        {io_pcb::hidename_scale}=100
-        refdes=C6
-        value=4.7uF
-        {io_pcb::hidename_direction}=1
-        {io_pcb::hidename_x}=105.4090 mm
-       }
-      ha:data {
-            li:padstack_prototypes {
-
-       ha:ps_proto_v4.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.0
-             li:ps_poly {
-              -13.77mil  
-              -9.84mil  
-              -13.77mil  
-              9.84mil  
-              13.77mil  
-              9.84mil  
-              13.77mil  
-              -9.84mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -16.77mil  
-              -12.84mil  
-              -16.77mil  
-              12.84mil  
-              16.77mil  
-              12.84mil  
-              16.77mil  
-              -12.84mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -13.77mil  
-              -9.84mil  
-              -13.77mil  
-              9.84mil  
-              13.77mil  
-              9.84mil  
-              13.77mil  
-              -9.84mil  
-             }
-           }
-         }
-       }
-      }
-
-       li:objects {
-        ha:padstack_ref.1187 {
-         proto=0; x=106.553mm; y=66.675004mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=1
-           name=1
-         }
-        }
-        ha:padstack_ref.1188 {
-         proto=0; x=106.553mm; y=67.474596mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1188 {
+         proto=0; x=106.553mm; y=67.474596mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -11616,6 +10822,7 @@ ha:pcb-rnd-board-v5 {
         value=2.49k
         {io_pcb::hidename_direction}=0
         {io_pcb::hidename_x}=105.5182 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -11769,6 +10976,7 @@ ha:pcb-rnd-board-v5 {
         {io_pcb::hidename_direction}=0
         use-license=Unlimited
         {io_pcb::hidename_x}=101.7016 mm
+         device=IC
        }
       ha:data {
             li:padstack_prototypes {
@@ -11984,6 +11192,7 @@ ha:pcb-rnd-board-v5 {
         value=2.2k
         {io_pcb::hidename_direction}=0
         {io_pcb::hidename_x}=96.7176 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -12133,6 +11342,7 @@ ha:pcb-rnd-board-v5 {
         value=2.2k
         {io_pcb::hidename_direction}=2
         {io_pcb::hidename_x}=95.6234 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -12282,6 +11492,7 @@ ha:pcb-rnd-board-v5 {
         value=encoder
         {io_pcb::hidename_direction}=0
         {io_pcb::hidename_x}=91.3892 mm
+         device=CONNECTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -12700,6 +11911,7 @@ ha:pcb-rnd-board-v5 {
         value=22
         {io_pcb::hidename_direction}=2
         {io_pcb::hidename_x}=45.6865 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -12770,7 +11982,7 @@ ha:pcb-rnd-board-v5 {
 
        li:objects {
         ha:padstack_ref.1309 {
-         proto=0; x=40.513mm; y=2.85648in; rot=180.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=1.642in; y=2.78274in; rot=180.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -12784,7 +11996,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.1310 {
-         proto=0; x=40.513mm; y=71.755mm; rot=180.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=1.642in; y=2.75126in; rot=180.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -12806,25 +12018,25 @@ ha:pcb-rnd-board-v5 {
 
           li:objects {
            ha:line.1311 {
-            x1=1.595in; y1=72.154796mm; x2=1.595in; y2=72.154796mm; thickness=0.1mm; clearance=0.0;
+            x1=1.642in; y1=2.767in; x2=1.642in; y2=2.767in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
            ha:line.1314 {
-            x1=1.595in; y1=72.154796mm; x2=1.595in; y2=72.154796mm; thickness=0.1mm; clearance=0.0;
+            x1=1.642in; y1=2.767in; x2=1.642in; y2=2.767in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
            ha:line.1317 {
-            x1=1.595in; y1=72.154796mm; x2=1.595in; y2=73.154796mm; thickness=0.1mm; clearance=0.0;
+            x1=1.642in; y1=2.767in; x2=1.642in; y2=71.2818mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
            ha:line.1320 {
-            x1=1.595in; y1=72.154796mm; x2=41.513mm; y2=72.154796mm; thickness=0.1mm; clearance=0.0;
+            x1=1.642in; y1=2.767in; x2=42.7068mm; y2=2.767in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -12849,6 +12061,7 @@ ha:pcb-rnd-board-v5 {
         value=22
         {io_pcb::hidename_direction}=2
         {io_pcb::hidename_x}=50.6593 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -12919,7 +12132,7 @@ ha:pcb-rnd-board-v5 {
 
        li:objects {
         ha:padstack_ref.1324 {
-         proto=0; x=1.8in; y=2.85648in; rot=180.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=1.688in; y=2.78274in; rot=180.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -12933,7 +12146,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.1325 {
-         proto=0; x=1.8in; y=71.755mm; rot=180.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=1.688in; y=2.75126in; rot=180.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -12955,25 +12168,25 @@ ha:pcb-rnd-board-v5 {
 
           li:objects {
            ha:line.1326 {
-            x1=1.8in; y1=72.154796mm; x2=1.8in; y2=72.154796mm; thickness=0.1mm; clearance=0.0;
+            x1=1.688in; y1=2.767in; x2=1.688in; y2=2.767in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
            ha:line.1329 {
-            x1=1.8in; y1=72.154796mm; x2=1.8in; y2=72.154796mm; thickness=0.1mm; clearance=0.0;
+            x1=1.688in; y1=2.767in; x2=1.688in; y2=2.767in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
            ha:line.1332 {
-            x1=1.8in; y1=72.154796mm; x2=1.8in; y2=73.154796mm; thickness=0.1mm; clearance=0.0;
+            x1=1.688in; y1=2.767in; x2=1.688in; y2=71.2818mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
            ha:line.1335 {
-            x1=1.8in; y1=72.154796mm; x2=46.72mm; y2=72.154796mm; thickness=0.1mm; clearance=0.0;
+            x1=1.688in; y1=2.767in; x2=43.8752mm; y2=2.767in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -12994,6 +12207,7 @@ ha:pcb-rnd-board-v5 {
         value=SMA
         footprint=sma-edge
         refdes=J8
+         device=CONNECTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -13264,277 +12478,6 @@ ha:pcb-rnd-board-v5 {
       }
        uid = 3jbuYMaM0jjDegHZ/p0AAABU
       }
-      ha:subc.1775 {
-       ha:attributes {
-        {io_pcb::hidename_y}=36.1442 mm
-        footprint=100mil-led
-        {io_pcb::hidename_scale}=100
-        refdes=D9
-        value=blue
-        {io_pcb::hidename_direction}=3
-        {io_pcb::hidename_x}=3.3020 mm
-       }
-      ha:data {
-            li:padstack_prototypes {
-
-       ha:ps_proto_v4.0 {
-         hdia=35.0mil; hplated=1; htop=0; hbottom=0;
-         li:shape {
-
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -35.0mil  
-              -35.0mil  
-              35.0mil  
-              -35.0mil  
-              35.0mil  
-              35.0mil  
-              -35.0mil  
-              35.0mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             bottom = 1
-             copper = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -35.0mil  
-              -35.0mil  
-              35.0mil  
-              -35.0mil  
-              35.0mil  
-              35.0mil  
-              -35.0mil  
-              35.0mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             intern = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -35.0mil  
-              -35.0mil  
-              35.0mil  
-              -35.0mil  
-              35.0mil  
-              35.0mil  
-              -35.0mil  
-              35.0mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -42.5mil  
-              -42.5mil  
-              42.5mil  
-              -42.5mil  
-              42.5mil  
-              42.5mil  
-              -42.5mil  
-              42.5mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             bottom = 1
-             mask = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -42.5mil  
-              -42.5mil  
-              42.5mil  
-              -42.5mil  
-              42.5mil  
-              42.5mil  
-              -42.5mil  
-              42.5mil  
-             }
-           }
-         }
-       }
-
-       ha:ps_proto_v4.1 {
-         hdia=35.0mil; hplated=1; htop=0; hbottom=0;
-         li:shape {
-
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=70.0mil;            }
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             top = 1
-            }
-            clearance=0.0
-           }
-
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=70.0mil;            }
-            ha:combining {            }
-            ha:layer_mask {
-             bottom = 1
-             copper = 1
-            }
-            clearance=0.0
-           }
-
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=70.0mil;            }
-            ha:combining {            }
-            ha:layer_mask {
-             copper = 1
-             intern = 1
-            }
-            clearance=0.0
-           }
-
-           ha:ps_shape_v4 {
-            ha:ps_circ { x=0.0; y=0.0; dia=85.0mil;            }
-            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=85.0mil;            }
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             bottom = 1
-             mask = 1
-            }
-            clearance=0.0
-           }
-         }
-       }
-      }
-
-       li:objects {
-        ha:padstack_ref.1776 {
-         proto=0; x=100.0mil; y=1.248in; rot=0.000000; xmirror=0; smirror=0; clearance=7.5mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=1
-           name=1
-         }
-        }
-        ha:padstack_ref.1777 {
-         proto=1; x=100.0mil; y=1.348in; rot=0.000000; xmirror=0; smirror=0; clearance=7.5mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-           li:1 {
-            on  
-            diag  
-            round  
-           }
-           li:3 {
-            on  
-            diag  
-            round  
-           }
-         }
-
-         ha:attributes {
-           term=2
-           name=2
-         }
-        }
-       }
-       li:layers {
-
-        ha:top-silk {
-         lid=0
-         ha:combining {         }
-
-          li:objects {
-           ha:line.1778 {
-            x1=43.0mil; y1=1.397in; x2=157.0mil; y2=1.397in; thickness=10.0mil; clearance=0.0;
-           }
-           ha:arc.1781 {
-            x=100.0mil; y=1.298in; width=114.0mil; height=114.0mil; astart=120.000000; adelta=300.000000; thickness=10.0mil; clearance=0.0;
-           }
-          }
-          ha:type {
-           silk = 1
-           top = 1
-          }
-        }
-
-        ha:subc-aux {
-         lid=1
-         ha:combining {         }
-
-          li:objects {
-           ha:line.1782 {
-            x1=100.0mil; y1=1.298in; x2=100.0mil; y2=1.298in; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=pnp-origin
-            }
-           }
-           ha:line.1785 {
-            x1=100.0mil; y1=1.298in; x2=100.0mil; y2=1.298in; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=origin
-            }
-           }
-           ha:line.1788 {
-            x1=100.0mil; y1=1.298in; x2=100.0mil; y2=31.9692mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=x
-            }
-           }
-           ha:line.1791 {
-            x1=100.0mil; y1=1.298in; x2=1.54mm; y2=1.298in; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=y
-            }
-           }
-          }
-          ha:type {
-           top = 1
-           misc = 1
-           virtual = 1
-          }
-        }
-       }
-      }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABV
-      }
       ha:subc.1794 {
        ha:attributes {
         {io_pcb::hidename_y}=24.1107 mm
@@ -13544,6 +12487,7 @@ ha:pcb-rnd-board-v5 {
         value=0.1uF
         {io_pcb::hidename_direction}=0
         {io_pcb::hidename_x}=41.9669 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -13693,6 +12637,7 @@ ha:pcb-rnd-board-v5 {
         value=10pF
         {io_pcb::hidename_direction}=0
         {io_pcb::hidename_x}=20.5108 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -13842,6 +12787,7 @@ ha:pcb-rnd-board-v5 {
         value=5.1pF
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=7.5311 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -13991,6 +12937,7 @@ ha:pcb-rnd-board-v5 {
         value=15nH
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=13.5885 mm
+         device=INDUCTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -14140,6 +13087,7 @@ ha:pcb-rnd-board-v5 {
         value=39pF
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=10.2235 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -14289,6 +13237,7 @@ ha:pcb-rnd-board-v5 {
         value=56nH
         {io_pcb::hidename_direction}=0
         {io_pcb::hidename_x}=12.2555 mm
+         device=INDUCTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -14358,306 +13307,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.1870 {
-         proto=0; x=444.0mil; y=1.78826in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=1
-           name=1
-         }
-        }
-        ha:padstack_ref.1871 {
-         proto=0; x=444.0mil; y=1.81974in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         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.1872 {
-            x1=444.0mil; y1=1.804in; x2=444.0mil; y2=1.804in; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=pnp-origin
-            }
-           }
-           ha:line.1875 {
-            x1=444.0mil; y1=1.804in; x2=444.0mil; y2=1.804in; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=origin
-            }
-           }
-           ha:line.1878 {
-            x1=444.0mil; y1=1.804in; x2=444.0mil; y2=44.8216mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=x
-            }
-           }
-           ha:line.1881 {
-            x1=444.0mil; y1=1.804in; x2=10.2776mm; y2=1.804in; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=y
-            }
-           }
-          }
-          ha:type {
-           top = 1
-           misc = 1
-           virtual = 1
-          }
-        }
-       }
-      }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABb
-      }
-      ha:subc.1884 {
-       ha:attributes {
-        {io_pcb::hidename_y}=38.5699 mm
-        footprint=0402
-        {io_pcb::hidename_scale}=100
-        refdes=C176
-        value=2.2pF
-        {io_pcb::hidename_direction}=2
-        {io_pcb::hidename_x}=16.5481 mm
-       }
-      ha:data {
-            li:padstack_prototypes {
-
-       ha:ps_proto_v4.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.0
-             li:ps_poly {
-              9.84mil  
-              -13.77mil  
-              -9.84mil  
-              -13.77mil  
-              -9.84mil  
-              13.77mil  
-              9.84mil  
-              13.77mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              12.84mil  
-              -16.77mil  
-              -12.84mil  
-              -16.77mil  
-              -12.84mil  
-              16.77mil  
-              12.84mil  
-              16.77mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              9.84mil  
-              -13.77mil  
-              -9.84mil  
-              -13.77mil  
-              -9.84mil  
-              13.77mil  
-              9.84mil  
-              13.77mil  
-             }
-           }
-         }
-       }
-      }
-
-       li:objects {
-        ha:padstack_ref.1885 {
-         proto=0; x=358.74mil; y=44.577mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         ha:flags {
-          clearline=1
-         }
-
-         li:thermal {
-         }
-
-         ha:attributes {
-           term=1
-           name=1
-         }
-        }
-        ha:padstack_ref.1886 {
-         proto=0; x=327.26mil; y=44.577mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
-         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.1887 {
-            x1=343.0mil; y1=1.755in; x2=343.0mil; y2=1.755in; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=pnp-origin
-            }
-           }
-           ha:line.1890 {
-            x1=343.0mil; y1=1.755in; x2=343.0mil; y2=1.755in; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=origin
-            }
-           }
-           ha:line.1893 {
-            x1=343.0mil; y1=1.755in; x2=7.7122mm; y2=1.755in; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=x
-            }
-           }
-           ha:line.1896 {
-            x1=343.0mil; y1=1.755in; x2=343.0mil; y2=43.577mm; thickness=0.1mm; clearance=0.0;
-            ha:attributes {
-              subc-role=y
-            }
-           }
-          }
-          ha:type {
-           top = 1
-           misc = 1
-           virtual = 1
-          }
-        }
-       }
-      }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABc
-      }
-      ha:subc.1899 {
-       ha:attributes {
-        {io_pcb::hidename_y}=45.2115 mm
-        footprint=0402
-        {io_pcb::hidename_scale}=100
-        refdes=L173
-        value=43nH
-        {io_pcb::hidename_direction}=2
-        {io_pcb::hidename_x}=5.7663 mm
-       }
-      ha:data {
-            li:padstack_prototypes {
-
-       ha:ps_proto_v4.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.0
-             li:ps_poly {
-              -13.77mil  
-              -9.84mil  
-              -13.77mil  
-              9.84mil  
-              13.77mil  
-              9.84mil  
-              13.77mil  
-              -9.84mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { sub=1; auto=1;            }
-            ha:layer_mask {
-             top = 1
-             mask = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -16.77mil  
-              -12.84mil  
-              -16.77mil  
-              12.84mil  
-              16.77mil  
-              12.84mil  
-              16.77mil  
-              -12.84mil  
-             }
-           }
-
-           ha:ps_shape_v4 {
-            ha:combining { auto=1;            }
-            ha:layer_mask {
-             top = 1
-             paste = 1
-            }
-            clearance=0.0
-             li:ps_poly {
-              -13.77mil  
-              -9.84mil  
-              -13.77mil  
-              9.84mil  
-              13.77mil  
-              9.84mil  
-              13.77mil  
-              -9.84mil  
-             }
-           }
-         }
-       }
-      }
-
-       li:objects {
-        ha:padstack_ref.1900 {
-         proto=0; x=293.0mil; y=1.75474in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1870 {
+         proto=0; x=444.0mil; y=1.78826in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -14670,8 +13321,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.1901 {
-         proto=0; x=293.0mil; y=1.72326in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1871 {
+         proto=0; x=444.0mil; y=1.81974in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -14692,26 +13343,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.1902 {
-            x1=293.0mil; y1=1.739in; x2=293.0mil; y2=1.739in; thickness=0.1mm; clearance=0.0;
+           ha:line.1872 {
+            x1=444.0mil; y1=1.804in; x2=444.0mil; y2=1.804in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.1905 {
-            x1=293.0mil; y1=1.739in; x2=293.0mil; y2=1.739in; thickness=0.1mm; clearance=0.0;
+           ha:line.1875 {
+            x1=444.0mil; y1=1.804in; x2=444.0mil; y2=1.804in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.1908 {
-            x1=293.0mil; y1=1.739in; x2=293.0mil; y2=45.1706mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1878 {
+            x1=444.0mil; y1=1.804in; x2=444.0mil; y2=44.8216mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.1911 {
-            x1=293.0mil; y1=1.739in; x2=8.4422mm; y2=1.739in; thickness=0.1mm; clearance=0.0;
+           ha:line.1881 {
+            x1=444.0mil; y1=1.804in; x2=10.2776mm; y2=1.804in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -14725,17 +13376,168 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABd
+       uid = 3jbuYMaM0jjDegHZ/p0AAABb
       }
-      ha:subc.1914 {
+      ha:subc.1884 {
        ha:attributes {
-        {io_pcb::hidename_y}=38.9067 mm
+        {io_pcb::hidename_y}=38.5699 mm
         footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=C173
-        value=56pF
-        {io_pcb::hidename_direction}=3
-        {io_pcb::hidename_x}=13.8303 mm
+        refdes=C176
+        value=2.2pF
+        {io_pcb::hidename_direction}=2
+        {io_pcb::hidename_x}=16.5481 mm
+         device=CAPACITOR
+       }
+      ha:data {
+            li:padstack_prototypes {
+
+       ha:ps_proto_v4.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.0
+             li:ps_poly {
+              9.84mil  
+              -13.77mil  
+              -9.84mil  
+              -13.77mil  
+              -9.84mil  
+              13.77mil  
+              9.84mil  
+              13.77mil  
+             }
+           }
+
+           ha:ps_shape_v4 {
+            ha:combining { sub=1; auto=1;            }
+            ha:layer_mask {
+             top = 1
+             mask = 1
+            }
+            clearance=0.0
+             li:ps_poly {
+              12.84mil  
+              -16.77mil  
+              -12.84mil  
+              -16.77mil  
+              -12.84mil  
+              16.77mil  
+              12.84mil  
+              16.77mil  
+             }
+           }
+
+           ha:ps_shape_v4 {
+            ha:combining { auto=1;            }
+            ha:layer_mask {
+             top = 1
+             paste = 1
+            }
+            clearance=0.0
+             li:ps_poly {
+              9.84mil  
+              -13.77mil  
+              -9.84mil  
+              -13.77mil  
+              -9.84mil  
+              13.77mil  
+              9.84mil  
+              13.77mil  
+             }
+           }
+         }
+       }
+      }
+
+       li:objects {
+        ha:padstack_ref.1885 {
+         proto=0; x=358.74mil; y=44.577mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         ha:flags {
+          clearline=1
+         }
+
+         li:thermal {
+         }
+
+         ha:attributes {
+           term=1
+           name=1
+         }
+        }
+        ha:padstack_ref.1886 {
+         proto=0; x=327.26mil; y=44.577mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         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.1887 {
+            x1=343.0mil; y1=1.755in; x2=343.0mil; y2=1.755in; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=pnp-origin
+            }
+           }
+           ha:line.1890 {
+            x1=343.0mil; y1=1.755in; x2=343.0mil; y2=1.755in; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=origin
+            }
+           }
+           ha:line.1893 {
+            x1=343.0mil; y1=1.755in; x2=7.7122mm; y2=1.755in; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=x
+            }
+           }
+           ha:line.1896 {
+            x1=343.0mil; y1=1.755in; x2=343.0mil; y2=43.577mm; thickness=0.1mm; clearance=0.0;
+            ha:attributes {
+              subc-role=y
+            }
+           }
+          }
+          ha:type {
+           top = 1
+           misc = 1
+           virtual = 1
+          }
+        }
+       }
+      }
+       uid = 3jbuYMaM0jjDegHZ/p0AAABc
+      }
+      ha:subc.1899 {
+       ha:attributes {
+        {io_pcb::hidename_y}=45.2115 mm
+        footprint=0402
+        {io_pcb::hidename_scale}=100
+        refdes=L173
+        value=43nH
+        {io_pcb::hidename_direction}=2
+        {io_pcb::hidename_x}=5.7663 mm
+         device=INDUCTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -14805,8 +13607,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.1915 {
-         proto=0; x=444.0mil; y=43.688004mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1900 {
+         proto=0; x=293.0mil; y=1.75474in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -14819,8 +13621,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.1916 {
-         proto=0; x=444.0mil; y=44.487596mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1901 {
+         proto=0; x=293.0mil; y=1.72326in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -14841,26 +13643,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.1917 {
-            x1=444.0mil; y1=44.0878mm; x2=444.0mil; y2=44.0878mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1902 {
+            x1=293.0mil; y1=1.739in; x2=293.0mil; y2=1.739in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.1920 {
-            x1=444.0mil; y1=44.0878mm; x2=444.0mil; y2=44.0878mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1905 {
+            x1=293.0mil; y1=1.739in; x2=293.0mil; y2=1.739in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.1923 {
-            x1=444.0mil; y1=44.0878mm; x2=444.0mil; y2=43.0878mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1908 {
+            x1=293.0mil; y1=1.739in; x2=293.0mil; y2=45.1706mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.1926 {
-            x1=444.0mil; y1=44.0878mm; x2=10.2776mm; y2=44.0878mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1911 {
+            x1=293.0mil; y1=1.739in; x2=8.4422mm; y2=1.739in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -14874,17 +13676,18 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABe
+       uid = 3jbuYMaM0jjDegHZ/p0AAABd
       }
-      ha:subc.1929 {
+      ha:subc.1914 {
        ha:attributes {
-        {io_pcb::hidename_y}=38.1381 mm
+        {io_pcb::hidename_y}=38.9067 mm
         footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=R171
-        value=18
+        refdes=C173
+        value=56pF
         {io_pcb::hidename_direction}=3
-        {io_pcb::hidename_x}=13.3675 mm
+        {io_pcb::hidename_x}=13.8303 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -14954,8 +13757,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.1930 {
-         proto=0; x=406.0mil; y=43.688004mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1915 {
+         proto=0; x=444.0mil; y=43.688004mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -14968,8 +13771,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.1931 {
-         proto=0; x=406.0mil; y=44.487596mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1916 {
+         proto=0; x=444.0mil; y=44.487596mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -14990,26 +13793,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.1932 {
-            x1=406.0mil; y1=44.0878mm; x2=406.0mil; y2=44.0878mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1917 {
+            x1=444.0mil; y1=44.0878mm; x2=444.0mil; y2=44.0878mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.1935 {
-            x1=406.0mil; y1=44.0878mm; x2=406.0mil; y2=44.0878mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1920 {
+            x1=444.0mil; y1=44.0878mm; x2=444.0mil; y2=44.0878mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.1938 {
-            x1=406.0mil; y1=44.0878mm; x2=406.0mil; y2=43.0878mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1923 {
+            x1=444.0mil; y1=44.0878mm; x2=444.0mil; y2=43.0878mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.1941 {
-            x1=406.0mil; y1=44.0878mm; x2=9.3124mm; y2=44.0878mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1926 {
+            x1=444.0mil; y1=44.0878mm; x2=10.2776mm; y2=44.0878mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -15023,17 +13826,18 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABf
+       uid = 3jbuYMaM0jjDegHZ/p0AAABe
       }
-      ha:subc.1944 {
+      ha:subc.1929 {
        ha:attributes {
-        {io_pcb::hidename_y}=56.9275 mm
+        {io_pcb::hidename_y}=38.1381 mm
         footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=C271
-        value=47nF
-        {io_pcb::hidename_direction}=1
-        {io_pcb::hidename_x}=13.3477 mm
+        refdes=R171
+        value=18
+        {io_pcb::hidename_direction}=3
+        {io_pcb::hidename_x}=13.3675 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -15103,8 +13907,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.1945 {
-         proto=0; x=561.0mil; y=52.781204mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1930 {
+         proto=0; x=406.0mil; y=43.688004mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -15117,8 +13921,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.1946 {
-         proto=0; x=561.0mil; y=53.580796mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1931 {
+         proto=0; x=406.0mil; y=44.487596mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -15139,26 +13943,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.1947 {
-            x1=561.0mil; y1=53.181mm; x2=561.0mil; y2=53.181mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1932 {
+            x1=406.0mil; y1=44.0878mm; x2=406.0mil; y2=44.0878mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.1950 {
-            x1=561.0mil; y1=53.181mm; x2=561.0mil; y2=53.181mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1935 {
+            x1=406.0mil; y1=44.0878mm; x2=406.0mil; y2=44.0878mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.1953 {
-            x1=561.0mil; y1=53.181mm; x2=561.0mil; y2=52.181mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1938 {
+            x1=406.0mil; y1=44.0878mm; x2=406.0mil; y2=43.0878mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.1956 {
-            x1=561.0mil; y1=53.181mm; x2=13.2494mm; y2=53.181mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1941 {
+            x1=406.0mil; y1=44.0878mm; x2=9.3124mm; y2=44.0878mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -15172,17 +13976,18 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABg
+       uid = 3jbuYMaM0jjDegHZ/p0AAABf
       }
-      ha:subc.1959 {
+      ha:subc.1944 {
        ha:attributes {
-        {io_pcb::hidename_y}=56.8513 mm
+        {io_pcb::hidename_y}=56.9275 mm
         footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=C291
+        refdes=C271
         value=47nF
         {io_pcb::hidename_direction}=1
-        {io_pcb::hidename_x}=14.5415 mm
+        {io_pcb::hidename_x}=13.3477 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -15252,8 +14057,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.1960 {
-         proto=0; x=599.0mil; y=52.769004mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1945 {
+         proto=0; x=561.0mil; y=52.781204mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -15266,8 +14071,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.1961 {
-         proto=0; x=599.0mil; y=53.568596mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1946 {
+         proto=0; x=561.0mil; y=53.580796mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -15288,26 +14093,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.1962 {
-            x1=599.0mil; y1=53.1688mm; x2=599.0mil; y2=53.1688mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1947 {
+            x1=561.0mil; y1=53.181mm; x2=561.0mil; y2=53.181mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.1965 {
-            x1=599.0mil; y1=53.1688mm; x2=599.0mil; y2=53.1688mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1950 {
+            x1=561.0mil; y1=53.181mm; x2=561.0mil; y2=53.181mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.1968 {
-            x1=599.0mil; y1=53.1688mm; x2=599.0mil; y2=52.1688mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1953 {
+            x1=561.0mil; y1=53.181mm; x2=561.0mil; y2=52.181mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.1971 {
-            x1=599.0mil; y1=53.1688mm; x2=14.2146mm; y2=53.1688mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1956 {
+            x1=561.0mil; y1=53.181mm; x2=13.2494mm; y2=53.181mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -15321,17 +14126,18 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABh
+       uid = 3jbuYMaM0jjDegHZ/p0AAABg
       }
-      ha:subc.1974 {
+      ha:subc.1959 {
        ha:attributes {
-        {io_pcb::hidename_y}=56.9661 mm
+        {io_pcb::hidename_y}=56.8513 mm
         footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=C251
+        refdes=C291
         value=47nF
         {io_pcb::hidename_direction}=1
-        {io_pcb::hidename_x}=10.9347 mm
+        {io_pcb::hidename_x}=14.5415 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -15401,8 +14207,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.1975 {
-         proto=0; x=485.0mil; y=52.781204mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1960 {
+         proto=0; x=599.0mil; y=52.769004mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -15415,8 +14221,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.1976 {
-         proto=0; x=485.0mil; y=53.580796mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1961 {
+         proto=0; x=599.0mil; y=53.568596mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -15437,26 +14243,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.1977 {
-            x1=485.0mil; y1=53.181mm; x2=485.0mil; y2=53.181mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1962 {
+            x1=599.0mil; y1=53.1688mm; x2=599.0mil; y2=53.1688mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.1980 {
-            x1=485.0mil; y1=53.181mm; x2=485.0mil; y2=53.181mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1965 {
+            x1=599.0mil; y1=53.1688mm; x2=599.0mil; y2=53.1688mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.1983 {
-            x1=485.0mil; y1=53.181mm; x2=485.0mil; y2=52.181mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1968 {
+            x1=599.0mil; y1=53.1688mm; x2=599.0mil; y2=52.1688mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.1986 {
-            x1=485.0mil; y1=53.181mm; x2=11.319mm; y2=53.181mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1971 {
+            x1=599.0mil; y1=53.1688mm; x2=14.2146mm; y2=53.1688mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -15470,17 +14276,18 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABi
+       uid = 3jbuYMaM0jjDegHZ/p0AAABh
       }
-      ha:subc.1989 {
+      ha:subc.1974 {
        ha:attributes {
-        {io_pcb::hidename_y}=56.9407 mm
+        {io_pcb::hidename_y}=56.9661 mm
         footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=C261
+        refdes=C251
         value=47nF
         {io_pcb::hidename_direction}=1
-        {io_pcb::hidename_x}=12.1539 mm
+        {io_pcb::hidename_x}=10.9347 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -15550,8 +14357,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.1990 {
-         proto=0; x=523.0mil; y=52.781204mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1975 {
+         proto=0; x=485.0mil; y=52.781204mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -15564,8 +14371,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.1991 {
-         proto=0; x=523.0mil; y=53.580796mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1976 {
+         proto=0; x=485.0mil; y=53.580796mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -15586,26 +14393,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.1992 {
-            x1=523.0mil; y1=53.181mm; x2=523.0mil; y2=53.181mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1977 {
+            x1=485.0mil; y1=53.181mm; x2=485.0mil; y2=53.181mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.1995 {
-            x1=523.0mil; y1=53.181mm; x2=523.0mil; y2=53.181mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1980 {
+            x1=485.0mil; y1=53.181mm; x2=485.0mil; y2=53.181mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.1998 {
-            x1=523.0mil; y1=53.181mm; x2=523.0mil; y2=52.181mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1983 {
+            x1=485.0mil; y1=53.181mm; x2=485.0mil; y2=52.181mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.2001 {
-            x1=523.0mil; y1=53.181mm; x2=12.2842mm; y2=53.181mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1986 {
+            x1=485.0mil; y1=53.181mm; x2=11.319mm; y2=53.181mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -15619,17 +14426,18 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABj
+       uid = 3jbuYMaM0jjDegHZ/p0AAABi
       }
-      ha:subc.2004 {
+      ha:subc.1989 {
        ha:attributes {
-        {io_pcb::hidename_y}=54.6293 mm
+        {io_pcb::hidename_y}=56.9407 mm
         footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=C231
-        value=1.8nF
+        refdes=C261
+        value=47nF
         {io_pcb::hidename_direction}=1
-        {io_pcb::hidename_x}=9.8679 mm
+        {io_pcb::hidename_x}=12.1539 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -15699,8 +14507,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.2005 {
-         proto=0; x=427.0mil; y=51.180996mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1990 {
+         proto=0; x=523.0mil; y=52.781204mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -15713,8 +14521,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.2006 {
-         proto=0; x=427.0mil; y=50.381404mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.1991 {
+         proto=0; x=523.0mil; y=53.580796mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -15735,26 +14543,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.2007 {
-            x1=427.0mil; y1=50.7812mm; x2=427.0mil; y2=50.7812mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1992 {
+            x1=523.0mil; y1=53.181mm; x2=523.0mil; y2=53.181mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.2010 {
-            x1=427.0mil; y1=50.7812mm; x2=427.0mil; y2=50.7812mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1995 {
+            x1=523.0mil; y1=53.181mm; x2=523.0mil; y2=53.181mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.2013 {
-            x1=427.0mil; y1=50.7812mm; x2=427.0mil; y2=51.7812mm; thickness=0.1mm; clearance=0.0;
+           ha:line.1998 {
+            x1=523.0mil; y1=53.181mm; x2=523.0mil; y2=52.181mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.2016 {
-            x1=427.0mil; y1=50.7812mm; x2=11.8458mm; y2=50.7812mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2001 {
+            x1=523.0mil; y1=53.181mm; x2=12.2842mm; y2=53.181mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -15768,17 +14576,18 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABk
+       uid = 3jbuYMaM0jjDegHZ/p0AAABj
       }
-      ha:subc.2019 {
+      ha:subc.2004 {
        ha:attributes {
-        {io_pcb::hidename_y}=52.1147 mm
+        {io_pcb::hidename_y}=54.6293 mm
         footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=C211
-        value=10nF
-        {io_pcb::hidename_direction}=3
-        {io_pcb::hidename_x}=9.6901 mm
+        refdes=C231
+        value=1.8nF
+        {io_pcb::hidename_direction}=1
+        {io_pcb::hidename_x}=9.8679 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -15848,8 +14657,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.2020 {
-         proto=0; x=352.0mil; y=50.368204mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.2005 {
+         proto=0; x=427.0mil; y=51.180996mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -15862,8 +14671,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.2021 {
-         proto=0; x=352.0mil; y=51.167796mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.2006 {
+         proto=0; x=427.0mil; y=50.381404mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -15884,26 +14693,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.2022 {
-            x1=352.0mil; y1=50.768mm; x2=352.0mil; y2=50.768mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2007 {
+            x1=427.0mil; y1=50.7812mm; x2=427.0mil; y2=50.7812mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.2025 {
-            x1=352.0mil; y1=50.768mm; x2=352.0mil; y2=50.768mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2010 {
+            x1=427.0mil; y1=50.7812mm; x2=427.0mil; y2=50.7812mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.2028 {
-            x1=352.0mil; y1=50.768mm; x2=352.0mil; y2=49.768mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2013 {
+            x1=427.0mil; y1=50.7812mm; x2=427.0mil; y2=51.7812mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.2031 {
-            x1=352.0mil; y1=50.768mm; x2=7.9408mm; y2=50.768mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2016 {
+            x1=427.0mil; y1=50.7812mm; x2=11.8458mm; y2=50.7812mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -15917,17 +14726,18 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABl
+       uid = 3jbuYMaM0jjDegHZ/p0AAABk
       }
-      ha:subc.2034 {
+      ha:subc.2019 {
        ha:attributes {
-        {io_pcb::hidename_y}=54.8965 mm
+        {io_pcb::hidename_y}=52.1147 mm
         footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=C221
-        value=47nF
-        {io_pcb::hidename_direction}=1
-        {io_pcb::hidename_x}=9.0043 mm
+        refdes=C211
+        value=10nF
+        {io_pcb::hidename_direction}=3
+        {io_pcb::hidename_x}=9.6901 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -15997,8 +14807,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.2035 {
-         proto=0; x=389.0mil; y=51.180996mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.2020 {
+         proto=0; x=352.0mil; y=50.368204mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -16011,8 +14821,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.2036 {
-         proto=0; x=389.0mil; y=50.381404mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.2021 {
+         proto=0; x=352.0mil; y=51.167796mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -16033,26 +14843,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.2037 {
-            x1=389.0mil; y1=50.7812mm; x2=389.0mil; y2=50.7812mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2022 {
+            x1=352.0mil; y1=50.768mm; x2=352.0mil; y2=50.768mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.2040 {
-            x1=389.0mil; y1=50.7812mm; x2=389.0mil; y2=50.7812mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2025 {
+            x1=352.0mil; y1=50.768mm; x2=352.0mil; y2=50.768mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.2043 {
-            x1=389.0mil; y1=50.7812mm; x2=389.0mil; y2=51.7812mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2028 {
+            x1=352.0mil; y1=50.768mm; x2=352.0mil; y2=49.768mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.2046 {
-            x1=389.0mil; y1=50.7812mm; x2=10.8806mm; y2=50.7812mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2031 {
+            x1=352.0mil; y1=50.768mm; x2=7.9408mm; y2=50.768mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -16066,17 +14876,18 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABm
+       uid = 3jbuYMaM0jjDegHZ/p0AAABl
       }
-      ha:subc.2049 {
+      ha:subc.2034 {
        ha:attributes {
-        {io_pcb::hidename_y}=51.4223 mm
+        {io_pcb::hidename_y}=54.8965 mm
         footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=L201
-        value=27nH
-        {io_pcb::hidename_direction}=2
-        {io_pcb::hidename_x}=10.4775 mm
+        refdes=C221
+        value=47nF
+        {io_pcb::hidename_direction}=1
+        {io_pcb::hidename_x}=9.0043 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -16093,14 +14904,14 @@ ha:pcb-rnd-board-v5 {
             }
             clearance=0.0
              li:ps_poly {
-              9.84mil  
               -13.77mil  
               -9.84mil  
               -13.77mil  
-              -9.84mil  
+              9.84mil  
               13.77mil  
               9.84mil  
               13.77mil  
+              -9.84mil  
              }
            }
 
@@ -16112,14 +14923,14 @@ ha:pcb-rnd-board-v5 {
             }
             clearance=0.0
              li:ps_poly {
-              12.84mil  
               -16.77mil  
               -12.84mil  
               -16.77mil  
-              -12.84mil  
+              12.84mil  
               16.77mil  
               12.84mil  
               16.77mil  
+              -12.84mil  
              }
            }
 
@@ -16131,14 +14942,14 @@ ha:pcb-rnd-board-v5 {
             }
             clearance=0.0
              li:ps_poly {
-              9.84mil  
               -13.77mil  
               -9.84mil  
               -13.77mil  
-              -9.84mil  
+              9.84mil  
               13.77mil  
               9.84mil  
               13.77mil  
+              -9.84mil  
              }
            }
          }
@@ -16146,8 +14957,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.2050 {
-         proto=0; x=268.74mil; y=1.977in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.2035 {
+         proto=0; x=389.0mil; y=51.180996mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -16160,8 +14971,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.2051 {
-         proto=0; x=237.26mil; y=1.977in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.2036 {
+         proto=0; x=389.0mil; y=50.381404mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -16182,26 +14993,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.2052 {
-            x1=253.0mil; y1=1.977in; x2=253.0mil; y2=1.977in; thickness=0.1mm; clearance=0.0;
+           ha:line.2037 {
+            x1=389.0mil; y1=50.7812mm; x2=389.0mil; y2=50.7812mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.2055 {
-            x1=253.0mil; y1=1.977in; x2=253.0mil; y2=1.977in; thickness=0.1mm; clearance=0.0;
+           ha:line.2040 {
+            x1=389.0mil; y1=50.7812mm; x2=389.0mil; y2=50.7812mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.2058 {
-            x1=253.0mil; y1=1.977in; x2=5.4262mm; y2=1.977in; thickness=0.1mm; clearance=0.0;
+           ha:line.2043 {
+            x1=389.0mil; y1=50.7812mm; x2=389.0mil; y2=51.7812mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.2061 {
-            x1=253.0mil; y1=1.977in; x2=253.0mil; y2=49.2158mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2046 {
+            x1=389.0mil; y1=50.7812mm; x2=10.8806mm; y2=50.7812mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -16215,17 +15026,18 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABn
+       uid = 3jbuYMaM0jjDegHZ/p0AAABm
       }
-      ha:subc.2064 {
+      ha:subc.2049 {
        ha:attributes {
-        {io_pcb::hidename_y}=49.9745 mm
+        {io_pcb::hidename_y}=51.4223 mm
         footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=C210
-        value=5.1pF
+        refdes=L201
+        value=27nH
         {io_pcb::hidename_direction}=2
-        {io_pcb::hidename_x}=6.2367 mm
+        {io_pcb::hidename_x}=10.4775 mm
+         device=INDUCTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -16295,8 +15107,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.2065 {
-         proto=0; x=8.127996mm; y=1.939in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.2050 {
+         proto=0; x=268.74mil; y=1.977in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -16309,8 +15121,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.2066 {
-         proto=0; x=7.328404mm; y=1.939in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.2051 {
+         proto=0; x=237.26mil; y=1.977in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -16331,26 +15143,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.2067 {
-            x1=7.7282mm; y1=1.939in; x2=7.7282mm; y2=1.939in; thickness=0.1mm; clearance=0.0;
+           ha:line.2052 {
+            x1=253.0mil; y1=1.977in; x2=253.0mil; y2=1.977in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.2070 {
-            x1=7.7282mm; y1=1.939in; x2=7.7282mm; y2=1.939in; thickness=0.1mm; clearance=0.0;
+           ha:line.2055 {
+            x1=253.0mil; y1=1.977in; x2=253.0mil; y2=1.977in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.2073 {
-            x1=7.7282mm; y1=1.939in; x2=6.7282mm; y2=1.939in; thickness=0.1mm; clearance=0.0;
+           ha:line.2058 {
+            x1=253.0mil; y1=1.977in; x2=5.4262mm; y2=1.977in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.2076 {
-            x1=7.7282mm; y1=1.939in; x2=7.7282mm; y2=48.2506mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2061 {
+            x1=253.0mil; y1=1.977in; x2=253.0mil; y2=49.2158mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -16364,17 +15176,18 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABo
+       uid = 3jbuYMaM0jjDegHZ/p0AAABn
       }
-      ha:subc.2079 {
+      ha:subc.2064 {
        ha:attributes {
-        {io_pcb::hidename_y}=41.7393 mm
+        {io_pcb::hidename_y}=49.9745 mm
         footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=L174
-        value=22nH
+        refdes=C210
+        value=5.1pF
         {io_pcb::hidename_direction}=2
-        {io_pcb::hidename_x}=5.9563 mm
+        {io_pcb::hidename_x}=6.2367 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -16444,8 +15257,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.2080 {
-         proto=0; x=6.730996mm; y=42.545mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.2065 {
+         proto=0; x=8.127996mm; y=1.939in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -16458,8 +15271,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.2081 {
-         proto=0; x=5.931404mm; y=42.545mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.2066 {
+         proto=0; x=7.328404mm; y=1.939in; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -16480,26 +15293,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.2082 {
-            x1=6.3312mm; y1=42.545mm; x2=6.3312mm; y2=42.545mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2067 {
+            x1=7.7282mm; y1=1.939in; x2=7.7282mm; y2=1.939in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.2085 {
-            x1=6.3312mm; y1=42.545mm; x2=6.3312mm; y2=42.545mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2070 {
+            x1=7.7282mm; y1=1.939in; x2=7.7282mm; y2=1.939in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.2088 {
-            x1=6.3312mm; y1=42.545mm; x2=5.3312mm; y2=42.545mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2073 {
+            x1=7.7282mm; y1=1.939in; x2=6.7282mm; y2=1.939in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.2091 {
-            x1=6.3312mm; y1=42.545mm; x2=6.3312mm; y2=41.545mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2076 {
+            x1=7.7282mm; y1=1.939in; x2=7.7282mm; y2=48.2506mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -16513,17 +15326,18 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABp
+       uid = 3jbuYMaM0jjDegHZ/p0AAABo
       }
-      ha:subc.2094 {
+      ha:subc.2079 {
        ha:attributes {
-        {io_pcb::hidename_y}=43.4975 mm
+        {io_pcb::hidename_y}=41.7393 mm
         footprint=0402
         {io_pcb::hidename_scale}=100
-        refdes=C177
-        value=tuning
+        refdes=L174
+        value=22nH
         {io_pcb::hidename_direction}=2
-        {io_pcb::hidename_x}=7.8425 mm
+        {io_pcb::hidename_x}=5.9563 mm
+         device=INDUCTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -16593,8 +15407,8 @@ ha:pcb-rnd-board-v5 {
       }
 
        li:objects {
-        ha:padstack_ref.2095 {
-         proto=0; x=6.730996mm; y=41.529mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.2080 {
+         proto=0; x=6.730996mm; y=42.545mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -16607,8 +15421,8 @@ ha:pcb-rnd-board-v5 {
            name=1
          }
         }
-        ha:padstack_ref.2096 {
-         proto=0; x=5.931404mm; y=41.529mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
+        ha:padstack_ref.2081 {
+         proto=0; x=5.931404mm; y=42.545mm; rot=0.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -16629,26 +15443,26 @@ ha:pcb-rnd-board-v5 {
          ha:combining {         }
 
           li:objects {
-           ha:line.2097 {
-            x1=6.3312mm; y1=41.529mm; x2=6.3312mm; y2=41.529mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2082 {
+            x1=6.3312mm; y1=42.545mm; x2=6.3312mm; y2=42.545mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
-           ha:line.2100 {
-            x1=6.3312mm; y1=41.529mm; x2=6.3312mm; y2=41.529mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2085 {
+            x1=6.3312mm; y1=42.545mm; x2=6.3312mm; y2=42.545mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
-           ha:line.2103 {
-            x1=6.3312mm; y1=41.529mm; x2=5.3312mm; y2=41.529mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2088 {
+            x1=6.3312mm; y1=42.545mm; x2=5.3312mm; y2=42.545mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
-           ha:line.2106 {
-            x1=6.3312mm; y1=41.529mm; x2=6.3312mm; y2=40.529mm; thickness=0.1mm; clearance=0.0;
+           ha:line.2091 {
+            x1=6.3312mm; y1=42.545mm; x2=6.3312mm; y2=41.545mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -16662,7 +15476,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
       }
-       uid = 3jbuYMaM0jjDegHZ/p0AAABq
+       uid = 3jbuYMaM0jjDegHZ/p0AAABp
       }
       ha:subc.2109 {
        ha:attributes {
@@ -16673,6 +15487,7 @@ ha:pcb-rnd-board-v5 {
         value=6.2pF
         {io_pcb::hidename_direction}=2
         {io_pcb::hidename_x}=11.7343 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -16822,6 +15637,7 @@ ha:pcb-rnd-board-v5 {
         value=5.1pF
         {io_pcb::hidename_direction}=2
         {io_pcb::hidename_x}=5.1181 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -16971,6 +15787,7 @@ ha:pcb-rnd-board-v5 {
         value=15nH
         {io_pcb::hidename_direction}=2
         {io_pcb::hidename_x}=5.8613 mm
+         device=INDUCTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -17120,6 +15937,7 @@ ha:pcb-rnd-board-v5 {
         value=27nH
         {io_pcb::hidename_direction}=2
         {io_pcb::hidename_x}=6.5527 mm
+         device=INDUCTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -17269,6 +16087,7 @@ ha:pcb-rnd-board-v5 {
         value=CC1200
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=14.7828 mm
+         device=IC
        }
       ha:data {
             li:padstack_prototypes {
@@ -18895,6 +17714,7 @@ ha:pcb-rnd-board-v5 {
         value=47nF
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=15.8369 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -19044,6 +17864,7 @@ ha:pcb-rnd-board-v5 {
         value=47nF
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=13.8811 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -19193,6 +18014,7 @@ ha:pcb-rnd-board-v5 {
         value=47nF
         {io_pcb::hidename_direction}=2
         {io_pcb::hidename_x}=22.7203 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -19342,6 +18164,7 @@ ha:pcb-rnd-board-v5 {
         value=56k
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=13.2461 mm
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -19491,6 +18314,7 @@ ha:pcb-rnd-board-v5 {
         value=40mhz
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=17.9268 mm
+         device=CRYSTAL
        }
       ha:data {
             li:padstack_prototypes {
@@ -19683,6 +18507,7 @@ ha:pcb-rnd-board-v5 {
         value=10pF
         {io_pcb::hidename_direction}=0
         {io_pcb::hidename_x}=17.7025 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -19832,6 +18657,7 @@ ha:pcb-rnd-board-v5 {
         value=47nF
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=20.2057 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -19981,6 +18807,7 @@ ha:pcb-rnd-board-v5 {
         value=0.22uF
         {io_pcb::hidename_direction}=1
         {io_pcb::hidename_x}=18.6883 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -20130,6 +18957,7 @@ ha:pcb-rnd-board-v5 {
         value=56nH
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=9.7663 mm
+         device=INDUCTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -20279,6 +19107,7 @@ ha:pcb-rnd-board-v5 {
         value=10nF
         {io_pcb::hidename_direction}=3
         {io_pcb::hidename_x}=11.4559 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -20428,6 +19257,7 @@ ha:pcb-rnd-board-v5 {
         value=100pF
         {io_pcb::hidename_direction}=0
         {io_pcb::hidename_x}=7.2395 mm
+         device=CAPACITOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -20573,6 +19403,7 @@ ha:pcb-rnd-board-v5 {
         value=Companion
         footprint=0-338068-8
         refdes=J9
+         device=CONNECTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -20793,7 +19624,7 @@ ha:pcb-rnd-board-v5 {
 
        li:objects {
         ha:padstack_ref.7874 {
-         proto=0; x=62.13mil; y=600.11mil; rot=270.000000; xmirror=0; smirror=0; clearance=8.0mil;
+         proto=0; x=63.0mil; y=890.0mil; rot=270.000000; xmirror=0; smirror=0; clearance=8.0mil;
          ha:flags {
           clearline=1
          }
@@ -20817,7 +19648,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.7875 {
-         proto=1; x=162.13mil; y=650.11mil; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
+         proto=1; x=163.0mil; y=940.0mil; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
          ha:flags {
           clearline=1
          }
@@ -20831,7 +19662,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.7876 {
-         proto=1; x=62.13mil; y=700.11mil; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
+         proto=1; x=63.0mil; y=990.0mil; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
          ha:flags {
           clearline=1
          }
@@ -20845,7 +19676,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.7877 {
-         proto=1; x=162.13mil; y=750.11mil; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
+         proto=1; x=163.0mil; y=1.04in; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
          ha:flags {
           clearline=1
          }
@@ -20859,7 +19690,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.7878 {
-         proto=1; x=62.13mil; y=800.11mil; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
+         proto=1; x=63.0mil; y=1.09in; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
          ha:flags {
           clearline=1
          }
@@ -20873,7 +19704,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.7879 {
-         proto=1; x=162.13mil; y=850.11mil; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
+         proto=1; x=163.0mil; y=1.14in; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
          ha:flags {
           clearline=1
          }
@@ -20887,7 +19718,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.7880 {
-         proto=1; x=62.13mil; y=900.11mil; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
+         proto=1; x=63.0mil; y=1.19in; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
          ha:flags {
           clearline=1
          }
@@ -20906,7 +19737,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.7881 {
-         proto=1; x=162.13mil; y=950.11mil; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
+         proto=1; x=163.0mil; y=1.24in; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
          ha:flags {
           clearline=1
          }
@@ -20920,7 +19751,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.7882 {
-         proto=2; x=133.0mil; y=545.0mil; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
+         proto=2; x=133.87mil; y=834.89mil; rot=270.000000; xmirror=0; smirror=0; clearance=6.0mil;
          ha:flags {
           clearline=1
          }
@@ -20942,16 +19773,16 @@ ha:pcb-rnd-board-v5 {
 
           li:objects {
            ha:line.7849 {
-            x1=5.397754mm; y1=484.18mil; x2=11.74mil; y2=484.18mil; thickness=6.0mil; clearance=0.0;
+            x1=213.38mil; y1=774.07mil; x2=12.61mil; y2=774.07mil; thickness=6.0mil; clearance=0.0;
            }
            ha:line.7852 {
-            x1=11.74mil; y1=484.18mil; x2=11.74mil; y2=27.07767mm; thickness=6.0mil; clearance=0.0;
+            x1=12.61mil; y1=774.07mil; x2=12.61mil; y2=1.35594in; thickness=6.0mil; clearance=0.0;
            }
            ha:line.7855 {
-            x1=11.74mil; y1=27.07767mm; x2=5.397754mm; y2=27.07767mm; thickness=6.0mil; clearance=0.0;
+            x1=12.61mil; y1=1.35594in; x2=213.38mil; y2=1.35594in; thickness=6.0mil; clearance=0.0;
            }
            ha:line.7858 {
-            x1=5.397754mm; y1=27.07767mm; x2=5.397754mm; y2=484.18mil; thickness=6.0mil; clearance=0.0;
+            x1=213.38mil; y1=1.35594in; x2=213.38mil; y2=774.07mil; thickness=6.0mil; clearance=0.0;
            }
           }
           ha:type {
@@ -20966,25 +19797,25 @@ ha:pcb-rnd-board-v5 {
 
           li:objects {
            ha:line.7862 {
-            x1=2.907002mm; y1=19.038372mm; x2=2.907002mm; y2=19.038372mm; thickness=0.1mm; clearance=0.0;
+            x1=2.9291mm; y1=26.401578mm; x2=2.9291mm; y2=26.401578mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
            ha:line.7865 {
-            x1=4.118102mm; y1=600.11mil; x2=4.118102mm; y2=600.11mil; thickness=0.1mm; clearance=0.0;
+            x1=163.0mil; y1=890.0mil; x2=163.0mil; y2=890.0mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
            ha:line.7868 {
-            x1=4.118102mm; y1=600.11mil; x2=3.118102mm; y2=600.11mil; thickness=0.1mm; clearance=0.0;
+            x1=163.0mil; y1=890.0mil; x2=3.1402mm; y2=890.0mil; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
            ha:line.7871 {
-            x1=4.118102mm; y1=600.11mil; x2=4.118102mm; y2=16.242794mm; thickness=0.1mm; clearance=0.0;
+            x1=163.0mil; y1=890.0mil; x2=163.0mil; y2=23.606mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -21005,6 +19836,7 @@ ha:pcb-rnd-board-v5 {
         value=1k
         footprint=0402
         refdes=R21
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -21162,6 +19994,7 @@ ha:pcb-rnd-board-v5 {
         value=1k
         footprint=0402
         refdes=R22
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -21232,7 +20065,7 @@ ha:pcb-rnd-board-v5 {
 
        li:objects {
         ha:padstack_ref.16992 {
-         proto=0; x=1.314in; y=69.85mm; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=1.353in; y=2.75126in; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -21246,7 +20079,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.16993 {
-         proto=0; x=1.314in; y=2.78148in; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=1.353in; y=2.78274in; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -21280,25 +20113,25 @@ ha:pcb-rnd-board-v5 {
 
           li:objects {
            ha:line.16980 {
-            x1=1.314in; y1=70.249796mm; x2=1.314in; y2=70.249796mm; thickness=0.1mm; clearance=0.0;
+            x1=1.353in; y1=2.767in; x2=1.353in; y2=2.767in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
            ha:line.16983 {
-            x1=1.314in; y1=70.249796mm; x2=1.314in; y2=70.249796mm; thickness=0.1mm; clearance=0.0;
+            x1=1.353in; y1=2.767in; x2=1.353in; y2=2.767in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
            ha:line.16986 {
-            x1=1.314in; y1=70.249796mm; x2=1.314in; y2=71.249796mm; thickness=0.1mm; clearance=0.0;
+            x1=1.353in; y1=2.767in; x2=1.353in; y2=71.2818mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
            ha:line.16989 {
-            x1=1.314in; y1=70.249796mm; x2=32.3756mm; y2=70.249796mm; thickness=0.1mm; clearance=0.0;
+            x1=1.353in; y1=2.767in; x2=33.3662mm; y2=2.767in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -21318,6 +20151,7 @@ ha:pcb-rnd-board-v5 {
         value=1k
         footprint=0402
         refdes=R20
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -21388,7 +20222,7 @@ ha:pcb-rnd-board-v5 {
 
        li:objects {
         ha:padstack_ref.17025 {
-         proto=0; x=1.633in; y=1.88in; rot=180.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=1.633in; y=1.88in; rot=90.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -21402,7 +20236,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.17026 {
-         proto=0; x=1.60152in; y=1.88in; rot=180.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=1.633in; y=1.84852in; rot=90.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -21436,25 +20270,25 @@ ha:pcb-rnd-board-v5 {
 
           li:objects {
            ha:line.17013 {
-            x1=41.078404mm; y1=1.88in; x2=41.078404mm; y2=1.88in; thickness=0.1mm; clearance=0.0;
+            x1=1.633in; y1=1.86426in; x2=1.633in; y2=1.86426in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
            ha:line.17016 {
-            x1=41.078404mm; y1=1.88in; x2=41.078404mm; y2=1.88in; thickness=0.1mm; clearance=0.0;
+            x1=1.633in; y1=1.86426in; x2=1.633in; y2=1.86426in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
            ha:line.17019 {
-            x1=41.078404mm; y1=1.88in; x2=40.078404mm; y2=1.88in; thickness=0.1mm; clearance=0.0;
+            x1=1.633in; y1=1.86426in; x2=1.633in; y2=46.352204mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
            ha:line.17022 {
-            x1=41.078404mm; y1=1.88in; x2=41.078404mm; y2=46.752mm; thickness=0.1mm; clearance=0.0;
+            x1=1.633in; y1=1.86426in; x2=42.4782mm; y2=1.86426in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -21475,6 +20309,7 @@ ha:pcb-rnd-board-v5 {
         value=1k
         footprint=0402
         refdes=R23
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -21545,7 +20380,7 @@ ha:pcb-rnd-board-v5 {
 
        li:objects {
         ha:padstack_ref.17058 {
-         proto=0; x=1.267in; y=69.85mm; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=33.147mm; y=2.75126in; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -21559,7 +20394,7 @@ ha:pcb-rnd-board-v5 {
          }
         }
         ha:padstack_ref.17059 {
-         proto=0; x=1.267in; y=2.78148in; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
+         proto=0; x=33.147mm; y=2.78274in; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
          ha:flags {
           clearline=1
          }
@@ -21593,25 +20428,25 @@ ha:pcb-rnd-board-v5 {
 
           li:objects {
            ha:line.17046 {
-            x1=1.267in; y1=70.249796mm; x2=1.267in; y2=70.249796mm; thickness=0.1mm; clearance=0.0;
+            x1=33.147mm; y1=2.767in; x2=33.147mm; y2=2.767in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=pnp-origin
             }
            }
            ha:line.17049 {
-            x1=1.267in; y1=70.249796mm; x2=1.267in; y2=70.249796mm; thickness=0.1mm; clearance=0.0;
+            x1=33.147mm; y1=2.767in; x2=33.147mm; y2=2.767in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=origin
             }
            }
            ha:line.17052 {
-            x1=1.267in; y1=70.249796mm; x2=1.267in; y2=71.249796mm; thickness=0.1mm; clearance=0.0;
+            x1=33.147mm; y1=2.767in; x2=33.147mm; y2=71.2818mm; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=x
             }
            }
            ha:line.17055 {
-            x1=1.267in; y1=70.249796mm; x2=31.1818mm; y2=70.249796mm; thickness=0.1mm; clearance=0.0;
+            x1=33.147mm; y1=2.767in; x2=32.147mm; y2=2.767in; thickness=0.1mm; clearance=0.0;
             ha:attributes {
               subc-role=y
             }
@@ -21632,6 +20467,7 @@ ha:pcb-rnd-board-v5 {
         value=1k
         openscad=0402
         refdes=R3
+         device=RESISTOR
        }
       ha:data {
             li:padstack_prototypes {
@@ -21793,6 +20629,7 @@ ha:pcb-rnd-board-v5 {
           value=0.1uF
           {io_pcb::hidename_direction}=0
           {io_pcb::hidename_x}=50.1391 mm
+           device=CAPACITOR
          }
         ha:data {
                 li:padstack_prototypes {
@@ -21942,6 +20779,7 @@ ha:pcb-rnd-board-v5 {
           value=22pF
           {io_pcb::hidename_direction}=0
           {io_pcb::hidename_x}=44.7815 mm
+           device=CAPACITOR
          }
         ha:data {
                 li:padstack_prototypes {
@@ -22091,6 +20929,7 @@ ha:pcb-rnd-board-v5 {
           value=22pF
           {io_pcb::hidename_direction}=0
           {io_pcb::hidename_x}=48.9725 mm
+           device=CAPACITOR
          }
         ha:data {
                 li:padstack_prototypes {
@@ -22236,6 +21075,7 @@ ha:pcb-rnd-board-v5 {
          value=STM32F103RBT6
          footprint=lqfp64
          refdes=U4
+          device=IC
         }
        ha:data {
               li:padstack_prototypes {
@@ -23429,6 +22269,7 @@ ha:pcb-rnd-board-v5 {
             value=27k
             {io_pcb::hidename_direction}=2
             {io_pcb::hidename_x}=72.4728 mm
+             device=RESISTOR
            }
           ha:data {
                     li:padstack_prototypes {
@@ -23582,6 +22423,7 @@ ha:pcb-rnd-board-v5 {
             {io_pcb::hidename_direction}=1
             use-license=Unlimited
             {io_pcb::hidename_x}=72.0344 mm
+             device=IC
            }
           ha:data {
                     li:padstack_prototypes {
@@ -23797,6 +22639,7 @@ ha:pcb-rnd-board-v5 {
             value=10uH
             {io_pcb::hidename_direction}=3
             {io_pcb::hidename_x}=69.4944 mm
+             device=INDUCTOR
            }
           ha:data {
                     li:padstack_prototypes {
@@ -23946,6 +22789,7 @@ ha:pcb-rnd-board-v5 {
             value=1uF-35V
             {io_pcb::hidename_direction}=1
             {io_pcb::hidename_x}=73.2917 mm
+             device=CAPACITOR
            }
           ha:data {
                     li:padstack_prototypes {
@@ -24095,6 +22939,7 @@ ha:pcb-rnd-board-v5 {
             value=4.7uF
             {io_pcb::hidename_direction}=0
             {io_pcb::hidename_x}=70.5485 mm
+             device=CAPACITOR
            }
           ha:data {
                     li:padstack_prototypes {
@@ -24244,6 +23089,7 @@ ha:pcb-rnd-board-v5 {
             value=56k
             {io_pcb::hidename_direction}=1
             {io_pcb::hidename_x}=74.1553 mm
+             device=RESISTOR
            }
           ha:data {
                     li:padstack_prototypes {
@@ -24393,6 +23239,7 @@ ha:pcb-rnd-board-v5 {
             value=470k
             {io_pcb::hidename_direction}=1
             {io_pcb::hidename_x}=74.1553 mm
+             device=RESISTOR
            }
           ha:data {
                     li:padstack_prototypes {
@@ -24542,6 +23389,7 @@ ha:pcb-rnd-board-v5 {
             value=NSR0240HT
             {io_pcb::hidename_direction}=0
             {io_pcb::hidename_x}=72.7735 mm
+             device=DIODE
            }
           ha:data {
                     li:padstack_prototypes {
@@ -24706,6 +23554,7 @@ ha:pcb-rnd-board-v5 {
             value=red
             {io_pcb::hidename_direction}=3
             {io_pcb::hidename_x}=85.0646 mm
+             device=LED
            }
           ha:data {
                     li:padstack_prototypes {
@@ -24972,6 +23821,7 @@ ha:pcb-rnd-board-v5 {
             value=1uF
             {io_pcb::hidename_direction}=2
             {io_pcb::hidename_x}=95.0915 mm
+             device=CAPACITOR
            }
           ha:data {
                     li:padstack_prototypes {
@@ -25121,6 +23971,7 @@ ha:pcb-rnd-board-v5 {
             value=27k
             {io_pcb::hidename_direction}=2
             {io_pcb::hidename_x}=95.2043 mm
+             device=RESISTOR
            }
           ha:data {
                     li:padstack_prototypes {
@@ -25270,6 +24121,7 @@ ha:pcb-rnd-board-v5 {
             value=15k
             {io_pcb::hidename_direction}=3
             {io_pcb::hidename_x}=95.0341 mm
+             device=RESISTOR
            }
           ha:data {
                     li:padstack_prototypes {
@@ -25423,6 +24275,7 @@ ha:pcb-rnd-board-v5 {
             {io_pcb::hidename_direction}=0
             use-license=Unlimited
             {io_pcb::hidename_x}=92.4560 mm
+             device=IC
            }
           ha:data {
                     li:padstack_prototypes {
@@ -25638,6 +24491,7 @@ ha:pcb-rnd-board-v5 {
             value=1uF
             {io_pcb::hidename_direction}=2
             {io_pcb::hidename_x}=99.5065 mm
+             device=CAPACITOR
            }
           ha:data {
                     li:padstack_prototypes {
@@ -25783,6 +24637,7 @@ ha:pcb-rnd-board-v5 {
              value=TSM200N03D
              footprint=PDFN33
              refdes=Q1
+              device=MOSFET
             }
            ha:data {
                       li:padstack_prototypes {
@@ -26193,6 +25048,7 @@ ha:pcb-rnd-board-v5 {
               value=16MHz
               footprint=ABM8
               refdes=X2
+               device=CRYSTAL
              }
             ha:data {
                         li:padstack_prototypes {
@@ -26439,277 +25295,12 @@ ha:pcb-rnd-board-v5 {
             }
              uid = 5XE8fgt+jiPjPxo4v9EAAACM
             }
-           ha:subc.101076 {
-            ha:attributes {
-             value=AT1220
-             footprint=dualbeeper
-             refdes=U8
-            }
-           ha:data {
-                      li:padstack_prototypes {
-
-            ha:ps_proto_v4.0 {
-              hdia=23.62mil; hplated=1; htop=0; hbottom=0;
-              li:shape {
-
-                ha:ps_shape_v4 {
-                 ha:ps_circ { x=0.0; y=0.0; dia=59.06mil;                 }
-                 ha:combining {                 }
-                 ha:layer_mask {
-                  copper = 1
-                  top = 1
-                 }
-                 clearance=0.0
-                }
-
-                ha:ps_shape_v4 {
-                 ha:ps_circ { x=0.0; y=0.0; dia=59.06mil;                 }
-                 ha:combining {                 }
-                 ha:layer_mask {
-                  bottom = 1
-                  copper = 1
-                 }
-                 clearance=0.0
-                }
-
-                ha:ps_shape_v4 {
-                 ha:ps_circ { x=0.0; y=0.0; dia=59.06mil;                 }
-                 ha:combining {                 }
-                 ha:layer_mask {
-                  copper = 1
-                  intern = 1
-                 }
-                 clearance=0.0
-                }
-
-                ha:ps_shape_v4 {
-                 ha:ps_circ { x=0.0; y=0.0; dia=59.06mil;                 }
-                 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=59.06mil;                 }
-                 ha:combining { sub=1; auto=1;                 }
-                 ha:layer_mask {
-                  bottom = 1
-                  mask = 1
-                 }
-                 clearance=0.0
-                }
-              }
-            }
-
-            ha:ps_proto_v4.1 {
-              hdia=27.56mil; hplated=1; htop=0; hbottom=0;
-              li:shape {
-
-                ha:ps_shape_v4 {
-                 ha:ps_circ { x=0.0; y=0.0; dia=68.9mil;                 }
-                 ha:combining {                 }
-                 ha:layer_mask {
-                  copper = 1
-                  top = 1
-                 }
-                 clearance=0.0
-                }
-
-                ha:ps_shape_v4 {
-                 ha:ps_circ { x=0.0; y=0.0; dia=68.9mil;                 }
-                 ha:combining {                 }
-                 ha:layer_mask {
-                  bottom = 1
-                  copper = 1
-                 }
-                 clearance=0.0
-                }
-
-                ha:ps_shape_v4 {
-                 ha:ps_circ { x=0.0; y=0.0; dia=68.9mil;                 }
-                 ha:combining {                 }
-                 ha:layer_mask {
-                  copper = 1
-                  intern = 1
-                 }
-                 clearance=0.0
-                }
-
-                ha:ps_shape_v4 {
-                 ha:ps_circ { x=0.0; y=0.0; dia=68.9mil;                 }
-                 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=68.9mil;                 }
-                 ha:combining { sub=1; auto=1;                 }
-                 ha:layer_mask {
-                  bottom = 1
-                  mask = 1
-                 }
-                 clearance=0.0
-                }
-              }
-            }
-           }
-
-            li:objects {
-             ha:padstack_ref.101100 {
-              proto=0; x=81.153mm; y=2.66594in; rot=90.000000; xmirror=0; smirror=0; clearance=6.0mil;
-              ha:flags {
-               clearline=1
-              }
-
-              li:thermal {
-                li:1 {
-                 on  
-                 diag  
-                 round  
-                }
-                li:3 {
-                 on  
-                 diag  
-                 round  
-                }
-              }
-
-              ha:attributes {
-                term=1
-                name=pin1
-              }
-             }
-             ha:padstack_ref.101101 {
-              proto=1; x=3.16459in; y=2.6316in; rot=90.000000; xmirror=0; smirror=0; clearance=6.0mil;
-              ha:flags {
-               clearline=1
-              }
-
-              li:thermal {
-                li:1 {
-                 on  
-                 diag  
-                 round  
-                }
-                li:3 {
-                 on  
-                 diag  
-                 round  
-                }
-              }
-
-              ha:attributes {
-                term=1
-                name=pin1
-              }
-             }
-             ha:padstack_ref.101102 {
-              proto=0; x=81.153mm; y=61.21527mm; rot=90.000000; xmirror=0; smirror=0; clearance=6.0mil;
-              ha:flags {
-               clearline=1
-              }
-
-              li:thermal {
-              }
-
-              ha:attributes {
-                term=2
-                name=pin2
-              }
-             }
-             ha:padstack_ref.101103 {
-              proto=1; x=3.22542in; y=2.44439in; rot=90.000000; xmirror=0; smirror=0; clearance=6.0mil;
-              ha:flags {
-               clearline=1
-              }
-
-              li:thermal {
-              }
-
-              ha:attributes {
-                term=2
-                name=pin2
-              }
-             }
-            }
-            li:layers {
-
-             ha:top-silk {
-              lid=0
-              ha:combining {              }
-
-               li:objects {
-                ha:line.101077 {
-                 x1=78.103222mm; y1=2.71811in; x2=78.103222mm; y2=2.59803in; thickness=10.0mil; clearance=0.0;
-                }
-                ha:line.101080 {
-                 x1=78.103222mm; y1=2.35788in; x2=78.103222mm; y2=62.940184mm; thickness=10.0mil; clearance=0.0;
-                }
-                ha:line.101083 {
-                 x1=76.578206mm; y1=2.41792in; x2=3.13497in; y2=2.41792in; thickness=10.0mil; clearance=0.0;
-                }
-                ha:arc.101086 {
-                 x=81.153mm; y=2.538in; width=6.100064mm; height=6.100064mm; astart=90.000000; adelta=360.000000; thickness=10.0mil; clearance=0.0;
-                }
-               }
-               ha:type {
-                silk = 1
-                top = 1
-               }
-             }
-
-             ha:subc-aux {
-              lid=1
-              ha:combining {              }
-
-               li:objects {
-                ha:line.101088 {
-                 x1=81.153063mm; y1=64.465073mm; x2=81.153063mm; y2=64.465073mm; thickness=0.1mm; clearance=0.0;
-                 ha:attributes {
-                   subc-role=pnp-origin
-                 }
-                }
-                ha:line.101091 {
-                 x1=81.153mm; y1=2.538in; x2=81.153mm; y2=2.538in; thickness=0.1mm; clearance=0.0;
-                 ha:attributes {
-                   subc-role=origin
-                 }
-                }
-                ha:line.101094 {
-                 x1=81.153mm; y1=2.538in; x2=81.153mm; y2=63.4652mm; thickness=0.1mm; clearance=0.0;
-                 ha:attributes {
-                   subc-role=x
-                 }
-                }
-                ha:line.101097 {
-                 x1=81.153mm; y1=2.538in; x2=82.153mm; y2=2.538in; thickness=0.1mm; clearance=0.0;
-                 ha:attributes {
-                   subc-role=y
-                 }
-                }
-               }
-               ha:type {
-                top = 1
-                misc = 1
-                virtual = 1
-               }
-             }
-            }
-           }
-            uid = 5XE8fgt+jiPjPxo4v9EAAACK
-           }
              ha:subc.112652 {
               ha:attributes {
                value=NHD-C12864LZ
                footprint=NHD-C12864LZ
                refdes=X3
+                device=LCD
               }
              ha:data {
                           li:padstack_prototypes {
@@ -27619,6 +26210,7 @@ ha:pcb-rnd-board-v5 {
                 value=1uF
                 refdes=C3
                 footprint=0402
+                 device=CAPACITOR
                }
               ha:data {
                             li:padstack_prototypes {
@@ -27777,6 +26369,7 @@ ha:pcb-rnd-board-v5 {
                 value=1uF
                 refdes=C4
                 footprint=0402
+                 device=CAPACITOR
                }
               ha:data {
                             li:padstack_prototypes {
@@ -27935,6 +26528,7 @@ ha:pcb-rnd-board-v5 {
                 value=1uF
                 refdes=C9
                 footprint=0402
+                 device=CAPACITOR
                }
               ha:data {
                             li:padstack_prototypes {
@@ -28093,6 +26687,7 @@ ha:pcb-rnd-board-v5 {
                 value=1uF
                 refdes=C10
                 footprint=0402
+                 device=CAPACITOR
                }
               ha:data {
                             li:padstack_prototypes {
@@ -28251,6 +26846,7 @@ ha:pcb-rnd-board-v5 {
                 value=1uF
                 refdes=C11
                 footprint=0402
+                 device=CAPACITOR
                }
               ha:data {
                             li:padstack_prototypes {
@@ -28409,6 +27005,7 @@ ha:pcb-rnd-board-v5 {
                 value=1uF
                 refdes=C12
                 footprint=0402
+                 device=CAPACITOR
                }
               ha:data {
                             li:padstack_prototypes {
@@ -28567,6 +27164,7 @@ ha:pcb-rnd-board-v5 {
                 value=1uF
                 refdes=C13
                 footprint=0402
+                 device=CAPACITOR
                }
               ha:data {
                             li:padstack_prototypes {
@@ -28725,6 +27323,7 @@ ha:pcb-rnd-board-v5 {
                 value=1uF
                 refdes=C14
                 footprint=0402
+                 device=CAPACITOR
                }
               ha:data {
                             li:padstack_prototypes {
@@ -28883,6 +27482,7 @@ ha:pcb-rnd-board-v5 {
                 value=1uF
                 footprint=0402
                 openscad=0402
+                 device=CAPACITOR
                }
               ha:data {
                             li:padstack_prototypes {
@@ -28965,234 +27565,1738 @@ ha:pcb-rnd-board-v5 {
                    term=1
                    name=1
                  }
-                }
-                ha:padstack_ref.116107 {
-                 proto=0; x=62.865mm; y=2.30948in; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
-                 ha:flags {
-                  clearline=1
+                }
+                ha:padstack_ref.116107 {
+                 proto=0; x=62.865mm; y=2.30948in; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
+                 ha:flags {
+                  clearline=1
+                 }
+
+                 li:thermal {
+                 }
+
+                 ha:attributes {
+                   term=2
+                   name=2
+                 }
+                }
+               }
+               li:layers {
+
+                ha:top-silk {
+                 lid=0
+                 ha:combining {                 }
+
+                  li:objects {
+                  }
+                  ha:type {
+                   silk = 1
+                   top = 1
+                  }
+                }
+
+                ha:subc-aux {
+                 lid=1
+                 ha:combining {                 }
+
+                  li:objects {
+                   ha:line.116094 {
+                    x1=62.865mm; y1=58.260996mm; x2=62.865mm; y2=58.260996mm; thickness=0.1mm; clearance=0.0;
+                    ha:attributes {
+                      subc-role=pnp-origin
+                    }
+                   }
+                   ha:line.116097 {
+                    x1=62.865mm; y1=58.260996mm; x2=62.865mm; y2=58.260996mm; thickness=0.1mm; clearance=0.0;
+                    ha:attributes {
+                      subc-role=origin
+                    }
+                   }
+                   ha:line.116100 {
+                    x1=62.865mm; y1=58.260996mm; x2=62.865mm; y2=59.260996mm; thickness=0.1mm; clearance=0.0;
+                    ha:attributes {
+                      subc-role=x
+                    }
+                   }
+                   ha:line.116103 {
+                    x1=62.865mm; y1=58.260996mm; x2=61.865mm; y2=58.260996mm; thickness=0.1mm; clearance=0.0;
+                    ha:attributes {
+                      subc-role=y
+                    }
+                   }
+                  }
+                  ha:type {
+                   top = 1
+                   misc = 1
+                   virtual = 1
+                  }
+                }
+               }
+              }
+               uid = 3rCXE+nsnsfB6pjpohsAAACE
+              }
+               ha:subc.122163 {
+                ha:attributes {
+                 refdes=R29
+                 value=1.5k
+                 footprint=0402
+                 openscad=0402
+                  device=RESISTOR
+                }
+               ha:data {
+                              li:padstack_prototypes {
+
+                ha:ps_proto_v4.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.0
+                      li:ps_poly {
+                       9.84mil  
+                       -13.77mil  
+                       -9.84mil  
+                       -13.77mil  
+                       -9.84mil  
+                       13.77mil  
+                       9.84mil  
+                       13.77mil  
+                      }
+                    }
+
+                    ha:ps_shape_v4 {
+                     ha:combining { sub=1; auto=1;                     }
+                     ha:layer_mask {
+                      top = 1
+                      mask = 1
+                     }
+                     clearance=0.0
+                      li:ps_poly {
+                       12.84mil  
+                       -16.77mil  
+                       -12.84mil  
+                       -16.77mil  
+                       -12.84mil  
+                       16.77mil  
+                       12.84mil  
+                       16.77mil  
+                      }
+                    }
+
+                    ha:ps_shape_v4 {
+                     ha:combining { auto=1;                     }
+                     ha:layer_mask {
+                      top = 1
+                      paste = 1
+                     }
+                     clearance=0.0
+                      li:ps_poly {
+                       9.84mil  
+                       -13.77mil  
+                       -9.84mil  
+                       -13.77mil  
+                       -9.84mil  
+                       13.77mil  
+                       9.84mil  
+                       13.77mil  
+                      }
+                    }
+                  }
+                }
+               }
+
+                li:objects {
+                 ha:padstack_ref.122177 {
+                  proto=0; x=1.308in; y=1.28026in; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
+                  ha:flags {
+                   clearline=1
+                  }
+
+                  li:thermal {
+                  }
+
+                  ha:attributes {
+                    term=1
+                    name=1
+                  }
+                 }
+                 ha:padstack_ref.122178 {
+                  proto=0; x=1.308in; y=1.31174in; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
+                  ha:flags {
+                   clearline=1
+                  }
+
+                  li:thermal {
+                  }
+
+                  ha:attributes {
+                    term=2
+                    name=2
+                  }
+                 }
+                }
+                li:layers {
+
+                 ha:top-silk {
+                  lid=0
+                  ha:combining {                  }
+
+                   li:objects {
+                   }
+                   ha:type {
+                    silk = 1
+                    top = 1
+                   }
+                 }
+
+                 ha:subc-aux {
+                  lid=1
+                  ha:combining {                  }
+
+                   li:objects {
+                    ha:line.122165 {
+                     x1=1.308in; y1=1.296in; x2=1.308in; y2=1.296in; thickness=0.1mm; clearance=0.0;
+                     ha:attributes {
+                       subc-role=pnp-origin
+                     }
+                    }
+                    ha:line.122168 {
+                     x1=1.308in; y1=1.296in; x2=1.308in; y2=1.296in; thickness=0.1mm; clearance=0.0;
+                     ha:attributes {
+                       subc-role=origin
+                     }
+                    }
+                    ha:line.122171 {
+                     x1=1.308in; y1=1.296in; x2=1.308in; y2=33.9184mm; thickness=0.1mm; clearance=0.0;
+                     ha:attributes {
+                       subc-role=x
+                     }
+                    }
+                    ha:line.122174 {
+                     x1=1.308in; y1=1.296in; x2=32.2232mm; y2=1.296in; thickness=0.1mm; clearance=0.0;
+                     ha:attributes {
+                       subc-role=y
+                     }
+                    }
+                   }
+                   ha:type {
+                    top = 1
+                    misc = 1
+                    virtual = 1
+                   }
+                 }
+                }
+               }
+                uid = /5XJYQGbZ6ZGlGJT8kYAAACH
+               }
+                ha:subc.140304 {
+                 ha:attributes {
+                  {io_pcb::hidename_y}=36.1442 mm
+                  footprint=100mil-led
+                  {io_pcb::hidename_scale}=100
+                  refdes=D9
+                  value=blue
+                  {io_pcb::hidename_direction}=3
+                  {io_pcb::hidename_x}=3.3020 mm
+                   device=LED
+                 }
+                ha:data {
+                                li:padstack_prototypes {
+
+                 ha:ps_proto_v4.0 {
+                   hdia=35.0mil; hplated=1; htop=0; hbottom=0;
+                   li:shape {
+
+                     ha:ps_shape_v4 {
+                      ha:combining {                      }
+                      ha:layer_mask {
+                       copper = 1
+                       top = 1
+                      }
+                      clearance=0.0
+                       li:ps_poly {
+                        -35.0mil  
+                        -35.0mil  
+                        35.0mil  
+                        -35.0mil  
+                        35.0mil  
+                        35.0mil  
+                        -35.0mil  
+                        35.0mil  
+                       }
+                     }
+
+                     ha:ps_shape_v4 {
+                      ha:combining {                      }
+                      ha:layer_mask {
+                       bottom = 1
+                       copper = 1
+                      }
+                      clearance=0.0
+                       li:ps_poly {
+                        -35.0mil  
+                        -35.0mil  
+                        35.0mil  
+                        -35.0mil  
+                        35.0mil  
+                        35.0mil  
+                        -35.0mil  
+                        35.0mil  
+                       }
+                     }
+
+                     ha:ps_shape_v4 {
+                      ha:combining {                      }
+                      ha:layer_mask {
+                       copper = 1
+                       intern = 1
+                      }
+                      clearance=0.0
+                       li:ps_poly {
+                        -35.0mil  
+                        -35.0mil  
+                        35.0mil  
+                        -35.0mil  
+                        35.0mil  
+                        35.0mil  
+                        -35.0mil  
+                        35.0mil  
+                       }
+                     }
+
+                     ha:ps_shape_v4 {
+                      ha:combining { sub=1; auto=1;                      }
+                      ha:layer_mask {
+                       top = 1
+                       mask = 1
+                      }
+                      clearance=0.0
+                       li:ps_poly {
+                        -42.5mil  
+                        -42.5mil  
+                        42.5mil  
+                        -42.5mil  
+                        42.5mil  
+                        42.5mil  
+                        -42.5mil  
+                        42.5mil  
+                       }
+                     }
+
+                     ha:ps_shape_v4 {
+                      ha:combining { sub=1; auto=1;                      }
+                      ha:layer_mask {
+                       bottom = 1
+                       mask = 1
+                      }
+                      clearance=0.0
+                       li:ps_poly {
+                        -42.5mil  
+                        -42.5mil  
+                        42.5mil  
+                        -42.5mil  
+                        42.5mil  
+                        42.5mil  
+                        -42.5mil  
+                        42.5mil  
+                       }
+                     }
+                   }
+                 }
+
+                 ha:ps_proto_v4.1 {
+                   hdia=35.0mil; hplated=1; htop=0; hbottom=0;
+                   li:shape {
+
+                     ha:ps_shape_v4 {
+                      ha:ps_circ { x=0.0; y=0.0; dia=70.0mil;                      }
+                      ha:combining {                      }
+                      ha:layer_mask {
+                       copper = 1
+                       top = 1
+                      }
+                      clearance=0.0
+                     }
+
+                     ha:ps_shape_v4 {
+                      ha:ps_circ { x=0.0; y=0.0; dia=70.0mil;                      }
+                      ha:combining {                      }
+                      ha:layer_mask {
+                       bottom = 1
+                       copper = 1
+                      }
+                      clearance=0.0
+                     }
+
+                     ha:ps_shape_v4 {
+                      ha:ps_circ { x=0.0; y=0.0; dia=70.0mil;                      }
+                      ha:combining {                      }
+                      ha:layer_mask {
+                       copper = 1
+                       intern = 1
+                      }
+                      clearance=0.0
+                     }
+
+                     ha:ps_shape_v4 {
+                      ha:ps_circ { x=0.0; y=0.0; dia=85.0mil;                      }
+                      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=85.0mil;                      }
+                      ha:combining { sub=1; auto=1;                      }
+                      ha:layer_mask {
+                       bottom = 1
+                       mask = 1
+                      }
+                      clearance=0.0
+                     }
+                   }
+                 }
+                }
+
+                 li:objects {
+                  ha:padstack_ref.140321 {
+                   proto=0; x=163.0mil; y=650.0mil; rot=-90.000000; xmirror=1; smirror=1; clearance=7.5mil;
+                   ha:flags {
+                    clearline=1
+                   }
+
+                   li:thermal {
+                   }
+
+                   ha:attributes {
+                     term=1
+                     name=1
+                   }
+                  }
+                  ha:padstack_ref.140322 {
+                   proto=1; x=63.0mil; y=650.0mil; rot=-90.000000; xmirror=1; smirror=1; clearance=7.5mil;
+                   ha:flags {
+                    clearline=1
+                   }
+
+                   li:thermal {
+                     li:1 {
+                      on  
+                      diag  
+                      round  
+                     }
+                     li:3 {
+                      on  
+                      diag  
+                      round  
+                     }
+                   }
+
+                   ha:attributes {
+                     term=2
+                     name=2
+                   }
+                  }
+                 }
+                 li:layers {
+
+                  ha:top-silk {
+                   lid=0
+                   ha:combining {                   }
+
+                    li:objects {
+                     ha:line.140305 {
+                      x1=14.0mil; y1=707.0mil; x2=14.0mil; y2=593.0mil; thickness=10.0mil; clearance=0.0;
+                     }
+                     ha:arc.140308 {
+                      x=113.0mil; y=650.0mil; width=114.0mil; height=114.0mil; astart=330.000000; adelta=-300.000000; thickness=10.0mil; clearance=0.0;
+                     }
+                    }
+                    ha:type {
+                     silk = 1
+                     bottom = 1
+                    }
+                  }
+
+                  ha:subc-aux {
+                   lid=1
+                   ha:combining {                   }
+
+                    li:objects {
+                     ha:line.140309 {
+                      x1=113.0mil; y1=650.0mil; x2=113.0mil; y2=650.0mil; thickness=0.1mm; clearance=0.0;
+                      ha:attributes {
+                        subc-role=pnp-origin
+                      }
+                     }
+                     ha:line.140312 {
+                      x1=113.0mil; y1=650.0mil; x2=113.0mil; y2=650.0mil; thickness=0.1mm; clearance=0.0;
+                      ha:attributes {
+                        subc-role=origin
+                      }
+                     }
+                     ha:line.140315 {
+                      x1=113.0mil; y1=650.0mil; x2=3.8702mm; y2=650.0mil; thickness=0.1mm; clearance=0.0;
+                      ha:attributes {
+                        subc-role=x
+                      }
+                     }
+                     ha:line.140318 {
+                      x1=113.0mil; y1=650.0mil; x2=113.0mil; y2=17.51mm; thickness=0.1mm; clearance=0.0;
+                      ha:attributes {
+                        subc-role=y
+                      }
+                     }
+                    }
+                    ha:type {
+                     bottom = 1
+                     virtual = 1
+                     misc = 1
+                    }
+                  }
+                 }
+                }
+                 uid = 3jbuYMaM0jjDegHZ/p0AAABV
+                }
+                 ha:subc.143585 {
+                  ha:attributes {
+                   value=4screws
+                   footprint=282834-4
+                   refdes=J2
+                    device=CONNECTOR
+                  }
+                 ha:data {
+                                  li:padstack_prototypes {
+
+                  ha:ps_proto_v4.0 {
+                    hdia=45.28mil; hplated=1; htop=0; hbottom=0;
+                    li:shape {
+
+                      ha:ps_shape_v4 {
+                       ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;                       }
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        copper = 1
+                        top = 1
+                       }
+                       clearance=0.0
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;                       }
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        bottom = 1
+                        copper = 1
+                       }
+                       clearance=0.0
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;                       }
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        copper = 1
+                        intern = 1
+                       }
+                       clearance=0.0
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:ps_circ { x=0.0; y=0.0; dia=83.46mil;                       }
+                       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=83.46mil;                       }
+                       ha:combining { sub=1; auto=1;                       }
+                       ha:layer_mask {
+                        bottom = 1
+                        mask = 1
+                       }
+                       clearance=0.0
+                      }
+                    }
+                  }
+
+                  ha:ps_proto_v4.1 {
+                    hdia=45.28mil; hplated=1; htop=0; hbottom=0;
+                    li:shape {
+
+                      ha:ps_shape_v4 {
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        copper = 1
+                        top = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                        }
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        bottom = 1
+                        copper = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                        }
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        copper = 1
+                        intern = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                        }
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:combining { sub=1; auto=1;                       }
+                       ha:layer_mask {
+                        top = 1
+                        mask = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                         41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                        }
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:combining { sub=1; auto=1;                       }
+                       ha:layer_mask {
+                        bottom = 1
+                        mask = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                         41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                        }
+                      }
+                    }
+                  }
+                 }
+
+                  li:objects {
+                   ha:padstack_ref.143611 {
+                    proto=0; x=3.0in; y=2.99in; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+                    ha:flags {
+                     clearline=1
+                    }
+
+                    li:thermal {
+                      li:1 {
+                       on  
+                       diag  
+                       round  
+                      }
+                      li:3 {
+                       on  
+                       diag  
+                       round  
+                      }
+                    }
+
+                    ha:attributes {
+                      term=4
+                      name=pin4
+                    }
+                   }
+                   ha:padstack_ref.143612 {
+                    proto=0; x=3.1in; y=2.99in; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+                    ha:flags {
+                     clearline=1
+                    }
+
+                    li:thermal {
+                    }
+
+                    ha:attributes {
+                      term=3
+                      name=pin3
+                    }
+                   }
+                   ha:padstack_ref.143613 {
+                    proto=0; x=3.2in; y=2.99in; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+                    ha:flags {
+                     clearline=1
+                    }
+
+                    li:thermal {
+                    }
+
+                    ha:attributes {
+                      term=2
+                      name=pin2
+                    }
+                   }
+                   ha:padstack_ref.143614 {
+                    proto=1; x=3.3in; y=2.99in; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+                    ha:flags {
+                     clearline=1
+                    }
+
+                    li:thermal {
+                    }
+
+                    ha:attributes {
+                      term=1
+                      name=pin1
+                    }
+                   }
+                  }
+                  li:layers {
+
+                   ha:top-silk {
+                    lid=0
+                    ha:combining {                    }
+
+                     li:objects {
+                      ha:line.143586 {
+                       x1=2.94094in; y1=72.69607mm; x2=2.94094in; y2=3.11796in; thickness=6.0mil; clearance=0.0;
+                      }
+                      ha:line.143589 {
+                       x1=2.94094in; y1=3.11796in; x2=85.31987mm; y2=3.11796in; thickness=6.0mil; clearance=0.0;
+                      }
+                      ha:line.143592 {
+                       x1=85.31987mm; y1=3.11796in; x2=85.31987mm; y2=72.69607mm; thickness=6.0mil; clearance=0.0;
+                      }
+                      ha:line.143595 {
+                       x1=85.31987mm; y1=72.69607mm; x2=2.94094in; y2=72.69607mm; thickness=6.0mil; clearance=0.0;
+                      }
+                     }
+                     ha:type {
+                      silk = 1
+                      top = 1
+                     }
+                   }
+
+                   ha:subc-aux {
+                    lid=1
+                    ha:combining {                    }
+
+                     li:objects {
+                      ha:line.143599 {
+                       x1=80.01mm; y1=2.99in; x2=80.01mm; y2=2.99in; thickness=0.1mm; clearance=0.0;
+                       ha:attributes {
+                         subc-role=pnp-origin
+                       }
+                      }
+                      ha:line.143602 {
+                       x1=2.94094in; y1=72.69607mm; x2=2.94094in; y2=72.69607mm; thickness=0.1mm; clearance=0.0;
+                       ha:attributes {
+                         subc-role=origin
+                       }
+                      }
+                      ha:line.143605 {
+                       x1=2.94094in; y1=72.69607mm; x2=2.94094in; y2=71.69607mm; thickness=0.1mm; clearance=0.0;
+                       ha:attributes {
+                         subc-role=x
+                       }
+                      }
+                      ha:line.143608 {
+                       x1=2.94094in; y1=72.69607mm; x2=73.699876mm; y2=72.69607mm; thickness=0.1mm; clearance=0.0;
+                       ha:attributes {
+                         subc-role=y
+                       }
+                      }
+                     }
+                     ha:type {
+                      top = 1
+                      misc = 1
+                      virtual = 1
+                     }
+                   }
+                  }
+                 }
+                  uid = Cf5LWQVSHEZco4LbxKwAAACI
                  }
+                 ha:subc.143646 {
+                  ha:attributes {
+                   value=4screws
+                   footprint=282834-4
+                   refdes=J3
+                    device=CONNECTOR
+                  }
+                 ha:data {
+                                  li:padstack_prototypes {
+
+                  ha:ps_proto_v4.0 {
+                    hdia=45.28mil; hplated=1; htop=0; hbottom=0;
+                    li:shape {
+
+                      ha:ps_shape_v4 {
+                       ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;                       }
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        copper = 1
+                        top = 1
+                       }
+                       clearance=0.0
+                      }
 
-                 li:thermal {
-                 }
+                      ha:ps_shape_v4 {
+                       ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;                       }
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        bottom = 1
+                        copper = 1
+                       }
+                       clearance=0.0
+                      }
 
-                 ha:attributes {
-                   term=2
-                   name=2
-                 }
-                }
-               }
-               li:layers {
+                      ha:ps_shape_v4 {
+                       ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;                       }
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        copper = 1
+                        intern = 1
+                       }
+                       clearance=0.0
+                      }
 
-                ha:top-silk {
-                 lid=0
-                 ha:combining {                 }
+                      ha:ps_shape_v4 {
+                       ha:ps_circ { x=0.0; y=0.0; dia=83.46mil;                       }
+                       ha:combining { sub=1; auto=1;                       }
+                       ha:layer_mask {
+                        top = 1
+                        mask = 1
+                       }
+                       clearance=0.0
+                      }
 
-                  li:objects {
-                  }
-                  ha:type {
-                   silk = 1
-                   top = 1
+                      ha:ps_shape_v4 {
+                       ha:ps_circ { x=0.0; y=0.0; dia=83.46mil;                       }
+                       ha:combining { sub=1; auto=1;                       }
+                       ha:layer_mask {
+                        bottom = 1
+                        mask = 1
+                       }
+                       clearance=0.0
+                      }
+                    }
                   }
-                }
 
-                ha:subc-aux {
-                 lid=1
-                 ha:combining {                 }
+                  ha:ps_proto_v4.1 {
+                    hdia=45.28mil; hplated=1; htop=0; hbottom=0;
+                    li:shape {
+
+                      ha:ps_shape_v4 {
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        copper = 1
+                        top = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                        }
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        bottom = 1
+                        copper = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                        }
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        copper = 1
+                        intern = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                        }
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:combining { sub=1; auto=1;                       }
+                       ha:layer_mask {
+                        top = 1
+                        mask = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                         41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                        }
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:combining { sub=1; auto=1;                       }
+                       ha:layer_mask {
+                        bottom = 1
+                        mask = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                         41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                        }
+                      }
+                    }
+                  }
+                 }
 
                   li:objects {
-                   ha:line.116094 {
-                    x1=62.865mm; y1=58.260996mm; x2=62.865mm; y2=58.260996mm; thickness=0.1mm; clearance=0.0;
+                   ha:padstack_ref.143672 {
+                    proto=0; x=64.135mm; y=2.99in; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+                    ha:flags {
+                     clearline=1
+                    }
+
+                    li:thermal {
+                      li:1 {
+                       on  
+                       diag  
+                       round  
+                      }
+                      li:3 {
+                       on  
+                       diag  
+                       round  
+                      }
+                    }
+
                     ha:attributes {
-                      subc-role=pnp-origin
+                      term=4
+                      name=pin4
                     }
                    }
-                   ha:line.116097 {
-                    x1=62.865mm; y1=58.260996mm; x2=62.865mm; y2=58.260996mm; thickness=0.1mm; clearance=0.0;
+                   ha:padstack_ref.143673 {
+                    proto=0; x=66.675mm; y=2.99in; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+                    ha:flags {
+                     clearline=1
+                    }
+
+                    li:thermal {
+                    }
+
                     ha:attributes {
-                      subc-role=origin
+                      term=3
+                      name=pin3
                     }
                    }
-                   ha:line.116100 {
-                    x1=62.865mm; y1=58.260996mm; x2=62.865mm; y2=59.260996mm; thickness=0.1mm; clearance=0.0;
+                   ha:padstack_ref.143674 {
+                    proto=0; x=69.215mm; y=2.99in; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+                    ha:flags {
+                     clearline=1
+                    }
+
+                    li:thermal {
+                      li:1 {
+                       on  
+                       diag  
+                       round  
+                      }
+                      li:3 {
+                       on  
+                       diag  
+                       round  
+                      }
+                    }
+
                     ha:attributes {
-                      subc-role=x
+                      term=2
+                      name=pin2
                     }
                    }
-                   ha:line.116103 {
-                    x1=62.865mm; y1=58.260996mm; x2=61.865mm; y2=58.260996mm; thickness=0.1mm; clearance=0.0;
+                   ha:padstack_ref.143675 {
+                    proto=1; x=71.755mm; y=2.99in; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+                    ha:flags {
+                     clearline=1
+                    }
+
+                    li:thermal {
+                    }
+
                     ha:attributes {
-                      subc-role=y
+                      term=1
+                      name=pin1
                     }
                    }
                   }
-                  ha:type {
-                   top = 1
-                   misc = 1
-                   virtual = 1
-                  }
-                }
-               }
-              }
-               uid = 3rCXE+nsnsfB6pjpohsAAACE
-              }
-               ha:subc.122163 {
-                ha:attributes {
-                 refdes=R29
-                 value=1.5k
-                 footprint=0402
-                 openscad=0402
-                }
-               ha:data {
-                              li:padstack_prototypes {
+                  li:layers {
 
-                ha:ps_proto_v4.0 {
-                  hdia=0.0; hplated=0; htop=0; hbottom=0;
-                  li:shape {
+                   ha:top-silk {
+                    lid=0
+                    ha:combining {                    }
 
-                    ha:ps_shape_v4 {
-                     ha:combining {                     }
-                     ha:layer_mask {
-                      copper = 1
+                     li:objects {
+                      ha:line.143647 {
+                       x1=2.46594in; y1=72.69607mm; x2=2.46594in; y2=3.11796in; thickness=6.0mil; clearance=0.0;
+                      }
+                      ha:line.143650 {
+                       x1=2.46594in; y1=3.11796in; x2=73.25487mm; y2=3.11796in; thickness=6.0mil; clearance=0.0;
+                      }
+                      ha:line.143653 {
+                       x1=73.25487mm; y1=3.11796in; x2=73.25487mm; y2=72.69607mm; thickness=6.0mil; clearance=0.0;
+                      }
+                      ha:line.143656 {
+                       x1=73.25487mm; y1=72.69607mm; x2=2.46594in; y2=72.69607mm; thickness=6.0mil; clearance=0.0;
+                      }
+                      ha:text.143659 {
+                       string=%a.parent.refdes%; x=2.46594in; y=72.69607mm; scale=100; fid=0; direction=0;
+                       ha:flags {
+                        dyntext=1
+                        floater=1
+                       }
+                      }
+                     }
+                     ha:type {
+                      silk = 1
                       top = 1
                      }
-                     clearance=0.0
-                      li:ps_poly {
-                       9.84mil  
-                       -13.77mil  
-                       -9.84mil  
-                       -13.77mil  
-                       -9.84mil  
-                       13.77mil  
-                       9.84mil  
-                       13.77mil  
-                      }
-                    }
+                   }
 
-                    ha:ps_shape_v4 {
-                     ha:combining { sub=1; auto=1;                     }
-                     ha:layer_mask {
+                   ha:subc-aux {
+                    lid=1
+                    ha:combining {                    }
+
+                     li:objects {
+                      ha:line.143660 {
+                       x1=67.945mm; y1=2.99in; x2=67.945mm; y2=2.99in; thickness=0.1mm; clearance=0.0;
+                       ha:attributes {
+                         subc-role=pnp-origin
+                       }
+                      }
+                      ha:line.143663 {
+                       x1=2.46594in; y1=72.69607mm; x2=2.46594in; y2=72.69607mm; thickness=0.1mm; clearance=0.0;
+                       ha:attributes {
+                         subc-role=origin
+                       }
+                      }
+                      ha:line.143666 {
+                       x1=2.46594in; y1=72.69607mm; x2=2.46594in; y2=71.69607mm; thickness=0.1mm; clearance=0.0;
+                       ha:attributes {
+                         subc-role=x
+                       }
+                      }
+                      ha:line.143669 {
+                       x1=2.46594in; y1=72.69607mm; x2=61.634876mm; y2=72.69607mm; thickness=0.1mm; clearance=0.0;
+                       ha:attributes {
+                         subc-role=y
+                       }
+                      }
+                     }
+                     ha:type {
                       top = 1
-                      mask = 1
+                      misc = 1
+                      virtual = 1
                      }
-                     clearance=0.0
-                      li:ps_poly {
-                       12.84mil  
-                       -16.77mil  
-                       -12.84mil  
-                       -16.77mil  
-                       -12.84mil  
-                       16.77mil  
-                       12.84mil  
-                       16.77mil  
+                   }
+                  }
+                 }
+                  uid = Cf5LWQVSHEZco4LbxKwAAACK
+                 }
+                 ha:subc.143707 {
+                  ha:attributes {
+                   value=4screws
+                   footprint=282834-4
+                   refdes=J4
+                    device=CONNECTOR
+                  }
+                 ha:data {
+                                  li:padstack_prototypes {
+
+                  ha:ps_proto_v4.0 {
+                    hdia=45.28mil; hplated=1; htop=0; hbottom=0;
+                    li:shape {
+
+                      ha:ps_shape_v4 {
+                       ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;                       }
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        copper = 1
+                        top = 1
+                       }
+                       clearance=0.0
                       }
-                    }
 
-                    ha:ps_shape_v4 {
-                     ha:combining { auto=1;                     }
-                     ha:layer_mask {
-                      top = 1
-                      paste = 1
-                     }
-                     clearance=0.0
-                      li:ps_poly {
-                       9.84mil  
-                       -13.77mil  
-                       -9.84mil  
-                       -13.77mil  
-                       -9.84mil  
-                       13.77mil  
-                       9.84mil  
-                       13.77mil  
+                      ha:ps_shape_v4 {
+                       ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;                       }
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        bottom = 1
+                        copper = 1
+                       }
+                       clearance=0.0
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:ps_circ { x=0.0; y=0.0; dia=70.87mil;                       }
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        copper = 1
+                        intern = 1
+                       }
+                       clearance=0.0
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:ps_circ { x=0.0; y=0.0; dia=83.46mil;                       }
+                       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=83.46mil;                       }
+                       ha:combining { sub=1; auto=1;                       }
+                       ha:layer_mask {
+                        bottom = 1
+                        mask = 1
+                       }
+                       clearance=0.0
                       }
                     }
                   }
-                }
-               }
 
-                li:objects {
-                 ha:padstack_ref.122177 {
-                  proto=0; x=1.308in; y=1.28026in; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
-                  ha:flags {
-                   clearline=1
-                  }
+                  ha:ps_proto_v4.1 {
+                    hdia=45.28mil; hplated=1; htop=0; hbottom=0;
+                    li:shape {
+
+                      ha:ps_shape_v4 {
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        copper = 1
+                        top = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                        }
+                      }
 
-                  li:thermal {
-                  }
+                      ha:ps_shape_v4 {
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        bottom = 1
+                        copper = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                        }
+                      }
 
-                  ha:attributes {
-                    term=1
-                    name=1
+                      ha:ps_shape_v4 {
+                       ha:combining {                       }
+                       ha:layer_mask {
+                        copper = 1
+                        intern = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                         35.435mil  
+                         -35.435mil  
+                         35.435mil  
+                        }
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:combining { sub=1; auto=1;                       }
+                       ha:layer_mask {
+                        top = 1
+                        mask = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                         41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                        }
+                      }
+
+                      ha:ps_shape_v4 {
+                       ha:combining { sub=1; auto=1;                       }
+                       ha:layer_mask {
+                        bottom = 1
+                        mask = 1
+                       }
+                       clearance=0.0
+                        li:ps_poly {
+                         -41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                         41.73mil  
+                         -41.73mil  
+                         41.73mil  
+                        }
+                      }
+                    }
                   }
                  }
-                 ha:padstack_ref.122178 {
-                  proto=0; x=1.308in; y=1.31174in; rot=270.000000; xmirror=0; smirror=0; clearance=10.0mil;
-                  ha:flags {
-                   clearline=1
-                  }
 
-                  li:thermal {
-                  }
+                  li:objects {
+                   ha:padstack_ref.143733 {
+                    proto=0; x=930.0mil; y=2.99in; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+                    ha:flags {
+                     clearline=1
+                    }
 
-                  ha:attributes {
-                    term=2
-                    name=2
+                    li:thermal {
+                      li:0 {
+                       on  
+                       diag  
+                       round  
+                      }
+                      li:1 {
+                       on  
+                       diag  
+                       round  
+                      }
+                      li:3 {
+                       on  
+                       diag  
+                       round  
+                      }
+                    }
+
+                    ha:attributes {
+                      term=4
+                      name=pin4
+                    }
+                   }
+                   ha:padstack_ref.143734 {
+                    proto=0; x=1.03in; y=2.99in; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+                    ha:flags {
+                     clearline=1
+                    }
+
+                    li:thermal {
+                    }
+
+                    ha:attributes {
+                      term=3
+                      name=pin3
+                    }
+                   }
+                   ha:padstack_ref.143735 {
+                    proto=0; x=1.13in; y=2.99in; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+                    ha:flags {
+                     clearline=1
+                    }
+
+                    li:thermal {
+                      li:1 {
+                       on  
+                       diag  
+                       round  
+                      }
+                      li:3 {
+                       on  
+                       diag  
+                       round  
+                      }
+                    }
+
+                    ha:attributes {
+                      term=2
+                      name=pin2
+                    }
+                   }
+                   ha:padstack_ref.143736 {
+                    proto=1; x=1.23in; y=2.99in; rot=0.000000; xmirror=0; smirror=0; clearance=6.3mil;
+                    ha:flags {
+                     clearline=1
+                    }
+
+                    li:thermal {
+                    }
+
+                    ha:attributes {
+                      term=1
+                      name=pin1
+                    }
+                   }
                   }
-                 }
-                }
-                li:layers {
+                  li:layers {
 
-                 ha:top-silk {
-                  lid=0
-                  ha:combining {                  }
+                   ha:top-silk {
+                    lid=0
+                    ha:combining {                    }
 
-                   li:objects {
+                     li:objects {
+                      ha:line.143708 {
+                       x1=870.94mil; y1=72.69607mm; x2=870.94mil; y2=3.11796in; thickness=6.0mil; clearance=0.0;
+                      }
+                      ha:line.143711 {
+                       x1=870.94mil; y1=3.11796in; x2=32.74187mm; y2=3.11796in; thickness=6.0mil; clearance=0.0;
+                      }
+                      ha:line.143714 {
+                       x1=32.74187mm; y1=3.11796in; x2=32.74187mm; y2=72.69607mm; thickness=6.0mil; clearance=0.0;
+                      }
+                      ha:line.143717 {
+                       x1=32.74187mm; y1=72.69607mm; x2=870.94mil; y2=72.69607mm; thickness=6.0mil; clearance=0.0;
+                      }
+                      ha:text.143720 {
+                       string=%a.parent.refdes%; x=870.94mil; y=72.69607mm; scale=100; fid=0; direction=0;
+                       ha:flags {
+                        dyntext=1
+                        floater=1
+                       }
+                      }
+                     }
+                     ha:type {
+                      silk = 1
+                      top = 1
+                     }
                    }
-                   ha:type {
-                    silk = 1
-                    top = 1
+
+                   ha:subc-aux {
+                    lid=1
+                    ha:combining {                    }
+
+                     li:objects {
+                      ha:line.143721 {
+                       x1=1.08in; y1=2.99in; x2=1.08in; y2=2.99in; thickness=0.1mm; clearance=0.0;
+                       ha:attributes {
+                         subc-role=pnp-origin
+                       }
+                      }
+                      ha:line.143724 {
+                       x1=870.94mil; y1=72.69607mm; x2=870.94mil; y2=72.69607mm; thickness=0.1mm; clearance=0.0;
+                       ha:attributes {
+                         subc-role=origin
+                       }
+                      }
+                      ha:line.143727 {
+                       x1=870.94mil; y1=72.69607mm; x2=870.94mil; y2=71.69607mm; thickness=0.1mm; clearance=0.0;
+                       ha:attributes {
+                         subc-role=x
+                       }
+                      }
+                      ha:line.143730 {
+                       x1=870.94mil; y1=72.69607mm; x2=21.121876mm; y2=72.69607mm; thickness=0.1mm; clearance=0.0;
+                       ha:attributes {
+                         subc-role=y
+                       }
+                      }
+                     }
+                     ha:type {
+                      top = 1
+                      misc = 1
+                      virtual = 1
+                     }
                    }
+                  }
+                 }
+                  uid = Cf5LWQVSHEZco4LbxKwAAACM
                  }
+                  ha:subc.155796 {
+                   ha:attributes {
+                    value=AT1220
+                    device=BEEPER
+                    footprint=AT1220
+                    refdes=U8
+                   }
+                  ha:data {
+                                    li:padstack_prototypes {
+
+                   ha:ps_proto_v4.0 {
+                     hdia=23.62mil; hplated=1; htop=0; hbottom=0;
+                     li:shape {
+
+                       ha:ps_shape_v4 {
+                        ha:combining {                        }
+                        ha:layer_mask {
+                         copper = 1
+                         top = 1
+                        }
+                        clearance=0.0
+                         li:ps_poly {
+                          -29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                          29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                         }
+                       }
+
+                       ha:ps_shape_v4 {
+                        ha:combining {                        }
+                        ha:layer_mask {
+                         bottom = 1
+                         copper = 1
+                        }
+                        clearance=0.0
+                         li:ps_poly {
+                          -29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                          29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                         }
+                       }
+
+                       ha:ps_shape_v4 {
+                        ha:combining {                        }
+                        ha:layer_mask {
+                         copper = 1
+                         intern = 1
+                        }
+                        clearance=0.0
+                         li:ps_poly {
+                          -29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                          29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                         }
+                       }
+
+                       ha:ps_shape_v4 {
+                        ha:combining { sub=1; auto=1;                        }
+                        ha:layer_mask {
+                         top = 1
+                         mask = 1
+                        }
+                        clearance=0.0
+                         li:ps_poly {
+                          -29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                          29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                         }
+                       }
+
+                       ha:ps_shape_v4 {
+                        ha:combining { sub=1; auto=1;                        }
+                        ha:layer_mask {
+                         bottom = 1
+                         mask = 1
+                        }
+                        clearance=0.0
+                         li:ps_poly {
+                          -29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                          29.53mil  
+                          -29.53mil  
+                          29.53mil  
+                         }
+                       }
+                     }
+                   }
 
-                 ha:subc-aux {
-                  lid=1
-                  ha:combining {                  }
+                   ha:ps_proto_v4.1 {
+                     hdia=23.62mil; hplated=1; htop=0; hbottom=0;
+                     li:shape {
+
+                       ha:ps_shape_v4 {
+                        ha:ps_circ { x=0.0; y=0.0; dia=59.06mil;                        }
+                        ha:combining {                        }
+                        ha:layer_mask {
+                         copper = 1
+                         top = 1
+                        }
+                        clearance=0.0
+                       }
+
+                       ha:ps_shape_v4 {
+                        ha:ps_circ { x=0.0; y=0.0; dia=59.06mil;                        }
+                        ha:combining {                        }
+                        ha:layer_mask {
+                         bottom = 1
+                         copper = 1
+                        }
+                        clearance=0.0
+                       }
+
+                       ha:ps_shape_v4 {
+                        ha:ps_circ { x=0.0; y=0.0; dia=59.06mil;                        }
+                        ha:combining {                        }
+                        ha:layer_mask {
+                         copper = 1
+                         intern = 1
+                        }
+                        clearance=0.0
+                       }
+
+                       ha:ps_shape_v4 {
+                        ha:ps_circ { x=0.0; y=0.0; dia=59.06mil;                        }
+                        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=59.06mil;                        }
+                        ha:combining { sub=1; auto=1;                        }
+                        ha:layer_mask {
+                         bottom = 1
+                         mask = 1
+                        }
+                        clearance=0.0
+                       }
+                     }
+                   }
+                  }
 
                    li:objects {
-                    ha:line.122165 {
-                     x1=1.308in; y1=1.296in; x2=1.308in; y2=1.296in; thickness=0.1mm; clearance=0.0;
-                     ha:attributes {
-                       subc-role=pnp-origin
+                    ha:padstack_ref.155820 {
+                     proto=0; x=81.153mm; y=2.66594in; rot=90.000000; xmirror=0; smirror=0; clearance=6.0mil;
+                     ha:flags {
+                      clearline=1
                      }
-                    }
-                    ha:line.122168 {
-                     x1=1.308in; y1=1.296in; x2=1.308in; y2=1.296in; thickness=0.1mm; clearance=0.0;
-                     ha:attributes {
-                       subc-role=origin
+
+                     li:thermal {
+                       li:1 {
+                        on  
+                        diag  
+                        round  
+                       }
+                       li:3 {
+                        on  
+                        diag  
+                        round  
+                       }
+                       li:4 {
+                        on  
+                        diag  
+                        round  
+                       }
                      }
-                    }
-                    ha:line.122171 {
-                     x1=1.308in; y1=1.296in; x2=1.308in; y2=33.9184mm; thickness=0.1mm; clearance=0.0;
+
                      ha:attributes {
-                       subc-role=x
+                       term=1
+                       name=pin1
                      }
                     }
-                    ha:line.122174 {
-                     x1=1.308in; y1=1.296in; x2=32.2232mm; y2=1.296in; thickness=0.1mm; clearance=0.0;
+                    ha:padstack_ref.155821 {
+                     proto=1; x=81.153mm; y=61.21527mm; rot=90.000000; xmirror=0; smirror=0; clearance=6.0mil;
+                     ha:flags {
+                      clearline=1
+                     }
+
+                     li:thermal {
+                     }
+
                      ha:attributes {
-                       subc-role=y
+                       term=2
+                       name=pin2
                      }
                     }
                    }
-                   ha:type {
-                    top = 1
-                    misc = 1
-                    virtual = 1
+                   li:layers {
+
+                    ha:top-silk {
+                     lid=0
+                     ha:combining {                     }
+
+                      li:objects {
+                       ha:line.155797 {
+                        x1=3.07493in; y1=2.71811in; x2=3.07493in; y2=2.59803in; thickness=10.0mil; clearance=0.0;
+                       }
+                       ha:line.155800 {
+                        x1=3.07493in; y1=2.35788in; x2=3.07493in; y2=2.47796in; thickness=10.0mil; clearance=0.0;
+                       }
+                       ha:line.155803 {
+                        x1=3.01489in; y1=2.41792in; x2=3.13497in; y2=2.41792in; thickness=10.0mil; clearance=0.0;
+                       }
+                       ha:arc.155806 {
+                        x=81.153mm; y=2.538in; width=240.16mil; height=240.16mil; astart=90.000000; adelta=360.000000; thickness=10.0mil; clearance=0.0;
+                       }
+                       ha:text.155807 {
+                        string=%a.parent.refdes%; x=81.153mm; y=2.538in; scale=100; fid=0; direction=1;
+                        ha:flags {
+                         dyntext=1
+                         floater=1
+                        }
+                       }
+                      }
+                      ha:type {
+                       silk = 1
+                       top = 1
+                      }
+                    }
+
+                    ha:subc-aux {
+                     lid=1
+                     ha:combining {                     }
+
+                      li:objects {
+                       ha:line.155808 {
+                        x1=81.153mm; y1=64.465073mm; x2=81.153mm; y2=64.465073mm; thickness=0.1mm; clearance=0.0;
+                        ha:attributes {
+                          subc-role=pnp-origin
+                        }
+                       }
+                       ha:line.155811 {
+                        x1=81.153mm; y1=2.538in; x2=81.153mm; y2=2.538in; thickness=0.1mm; clearance=0.0;
+                        ha:attributes {
+                          subc-role=origin
+                        }
+                       }
+                       ha:line.155814 {
+                        x1=81.153mm; y1=2.538in; x2=81.153mm; y2=63.4652mm; thickness=0.1mm; clearance=0.0;
+                        ha:attributes {
+                          subc-role=x
+                        }
+                       }
+                       ha:line.155817 {
+                        x1=81.153mm; y1=2.538in; x2=82.153mm; y2=2.538in; thickness=0.1mm; clearance=0.0;
+                        ha:attributes {
+                          subc-role=y
+                        }
+                       }
+                      }
+                      ha:type {
+                       top = 1
+                       misc = 1
+                       virtual = 1
+                      }
+                    }
                    }
-                 }
-                }
-               }
-                uid = /5XJYQGbZ6ZGlGJT8kYAAACH
-               }
+                  }
+                   uid = Lzl3IAHHx1RScAxO5aIAAACI
+                  }
    }
    li:layers {
 
@@ -29200,7 +29304,7 @@ ha:pcb-rnd-board-v5 {
      lid=0
      group=3
      ha:combining {     }
-     visible=1
+     visible=0
 
       li:objects {
        ha:line.2689 {
@@ -29227,12 +29331,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.2860 {
-        x1=73.66mm; y1=2.99in; x2=73.66mm; y2=2.99in; thickness=25.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.2890 {
         x1=104.14mm; y1=77.851mm; x2=104.1654mm; y2=3.064in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -29390,7 +29488,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.2989 {
-        x1=3.639in; y1=78.7654mm; x2=101.2576mm; y2=78.7654mm; thickness=10.0mil; clearance=20.0mil;
+        x1=3.639in; y1=78.7654mm; x2=3.95826in; y2=78.7654mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -30367,18 +30465,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.4315 {
-        x1=233.52mil; y1=41.529mm; x2=233.52mil; y2=42.545mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.4318 {
-        x1=265.0mil; y1=41.529mm; x2=265.0mil; y2=42.545mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.4321 {
         x1=265.0mil; y1=1.677in; x2=296.0mil; y2=1.677in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -30511,18 +30597,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.50848 {
-        x1=111.0mil; y1=966.0mil; x2=111.0mil; y2=848.98mil; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.50851 {
-        x1=111.0mil; y1=848.98mil; x2=62.13mil; y2=800.11mil; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.53403 {
         x1=651.0mil; y1=46.0111mm; x2=651.0mil; y2=1.776in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -30565,12 +30639,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.60654 {
-        x1=1.23in; y1=75.94603mm; x2=1.23in; y2=75.424792mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.62838 {
         x1=1.663in; y1=61.0mil; x2=1.641in; y2=61.0mil; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -30613,48 +30681,12 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.64727 {
-        x1=1.8in; y1=2.99in; x2=1.8in; y2=72.554592mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.64730 {
-        x1=1.8in; y1=2.825in; x2=1.707in; y2=2.825in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.64733 {
-        x1=1.707in; y1=2.825in; x2=1.685in; y2=2.803in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.64892 {
-        x1=41.783mm; y1=2.803in; x2=1.617in; y2=2.803in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.64895 {
-        x1=1.617in; y1=2.803in; x2=1.595in; y2=2.825in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.64898 {
         x1=1.7in; y1=2.99in; x2=1.7in; y2=75.221592mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.64901 {
-        x1=1.7in; y1=75.221592mm; x2=1.595in; y2=72.554592mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.65212 {
         x1=41.335071mm; y1=1.73494in; x2=1.70794in; y2=1.73494in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -30817,42 +30849,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.86115 {
-        x1=1.267in; y1=2.609in; x2=1.267in; y2=2.75in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.86265 {
-        x1=1.267in; y1=2.78148in; x2=31.458438mm; y2=2.78148in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.86268 {
-        x1=31.458438mm; y1=2.78148in; x2=1.03in; y2=75.94603mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.86421 {
-        x1=1.314in; y1=2.592in; x2=1.314in; y2=2.75in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.86568 {
-        x1=1.314in; y1=2.78148in; x2=1.314in; y2=73.81243mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.86571 {
-        x1=1.314in; y1=73.81243mm; x2=1.23in; y2=75.94603mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.87030 {
         x1=1.50926in; y1=1.833365in; x2=1.50926in; y2=1.90426in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -30883,30 +30879,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.87192 {
-        x1=1.52894in; y1=1.833365in; x2=1.52894in; y2=1.89494in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.87195 {
-        x1=1.52894in; y1=1.89494in; x2=1.542in; y2=1.908in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.87198 {
-        x1=1.542in; y1=1.908in; x2=1.589in; y2=1.908in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.87207 {
-        x1=1.589in; y1=1.908in; x2=1.629in; y2=1.948in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.87210 {
         x1=1.629in; y1=1.948in; x2=1.629in; y2=2.15526in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -31003,72 +30975,12 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.89160 {
-        x1=905.0mil; y1=1.507in; x2=198.0mil; y2=800.0mil; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.89163 {
-        x1=198.0mil; y1=800.0mil; x2=137.0mil; y2=800.0mil; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.89166 {
-        x1=137.0mil; y1=800.0mil; x2=62.0mil; y2=725.0mil; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.89169 {
-        x1=62.0mil; y1=725.0mil; x2=62.0mil; y2=700.24mil; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.89172 {
-        x1=62.0mil; y1=700.24mil; x2=62.13mil; y2=700.11mil; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.89295 {
-        x1=177.0mil; y1=750.0mil; x2=162.24mil; y2=750.0mil; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.89298 {
-        x1=162.24mil; y1=750.0mil; x2=4.118102mm; y2=750.11mil; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.89413 {
-        x1=906.0mil; y1=36.7284mm; x2=873.0mil; y2=36.7284mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.89416 {
-        x1=177.0mil; y1=750.0mil; x2=873.0mil; y2=36.7284mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.89530 {
         x1=4.118102mm; y1=650.11mil; x2=4.118102mm; y2=16.716502mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.89533 {
-        x1=4.118102mm; y1=16.716502mm; x2=981.0mil; y2=1.477in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.89645 {
         x1=1.174625in; y1=1.49873in; x2=25.457658mm; y2=1.49873in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -31087,12 +30999,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.89771 {
-        x1=21.590508mm; y1=1.538in; x2=4.118102mm; y2=850.11mil; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.89882 {
         x1=1.174625in; y1=1.51842in; x2=1.01158in; y2=1.51842in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -31106,13 +31012,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.89888 {
-        x1=971.0mil; y1=39.5986mm; x2=704.0mil; y2=39.5986mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.89891 {
-        x1=704.0mil; y1=39.5986mm; x2=111.0mil; y2=966.0mil; thickness=10.0mil; clearance=20.0mil;
+        x1=971.0mil; y1=39.5986mm; x2=835.0mil; y2=39.5986mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -31130,7 +31030,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.90005 {
-        x1=979.0mil; y1=1.58in; x2=553.0mil; y2=1.58in; thickness=10.0mil; clearance=20.0mil;
+        x1=979.0mil; y1=1.58in; x2=771.0mil; y2=1.58in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -31717,18 +31617,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.97398 {
-        x1=1.587in; y1=1.704in; x2=1.587in; y2=47.371mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97401 {
-        x1=1.587in; y1=47.371mm; x2=1.602in; y2=1.88in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.97446 {
         x1=42.545mm; y1=61.671709mm; x2=42.548498mm; y2=61.675207mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -31783,60 +31671,12 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.97629 {
-        x1=1.174625in; y1=1.6562in; x2=31.82112mm; y2=1.6562in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97632 {
-        x1=31.82112mm; y1=1.6562in; x2=1.253in; y2=1.656in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97675 {
-        x1=945.0mil; y1=1.665in; x2=1.116in; y2=1.665in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97678 {
-        x1=1.116in; y1=1.665in; x2=1.144in; y2=1.637in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97681 {
-        x1=1.144in; y1=1.637in; x2=29.823283mm; y2=1.637in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.97684 {
         x1=29.823283mm; y1=1.637in; x2=1.174625in; y2=1.63652in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.97688 {
-        x1=1.174625in; y1=1.61683in; x2=1.13317in; y2=1.61683in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97691 {
-        x1=1.13317in; y1=1.61683in; x2=1.116in; y2=1.634in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97694 {
-        x1=1.116in; y1=1.634in; x2=972.0mil; y2=1.634in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.97768 {
         x1=1.644in; y1=1.919in; x2=1.644in; y2=1.891in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -32053,26 +31893,14 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.86418 {
-        x1=1.41083in; y1=2.49517in; x2=1.314in; y2=2.592in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.86112 {
-        x1=1.39116in; y1=2.48484in; x2=1.267in; y2=2.609in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.86109 {
-        x1=1.39116in; y1=1.833365in; x2=1.39116in; y2=2.48484in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.39116in; y1=46.567471mm; x2=1.39116in; y2=2.50484in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.86415 {
-        x1=1.41083in; y1=1.833365in; x2=1.41083in; y2=2.49517in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.41083in; y1=46.567471mm; x2=1.41083in; y2=2.49517in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32090,7 +31918,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.104895 {
-        x1=26.7462mm; y1=1.88674in; x2=26.7462mm; y2=1.914in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.053in; y1=1.88674in; x2=1.053in; y2=1.914in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32102,37 +31930,37 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.104901 {
-        x1=26.7462mm; y1=1.85526in; x2=28.542996mm; y2=1.85526in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.053in; y1=1.85526in; x2=1.12374in; y2=1.85526in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.104904 {
-        x1=1.189in; y1=1.79in; x2=28.542996mm; y2=1.85526in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.189in; y1=1.79in; x2=1.12374in; y2=1.85526in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.104982 {
-        x1=679.44mil; y1=1.9582in; x2=23.36292mm; y2=1.9582in; thickness=10.0mil; clearance=20.0mil;
+        x1=679.44mil; y1=1.9582in; x2=919.8mil; y2=1.9582in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.104985 {
-        x1=23.36292mm; y1=1.9582in; x2=1.023in; y2=1.855in; thickness=10.0mil; clearance=20.0mil;
+        x1=919.8mil; y1=1.9582in; x2=1.023in; y2=47.117mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.104988 {
-        x1=1.023in; y1=1.855in; x2=26.859992mm; y2=1.855in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.023in; y1=47.117mm; x2=1.05748in; y2=47.117mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.104991 {
-        x1=26.859992mm; y1=1.855in; x2=1.05774in; y2=1.85526in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.05748in; y1=47.117mm; x2=1.05774in; y2=1.85526in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32144,13 +31972,13 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105138 {
-        x1=465.0mil; y1=67.31mm; x2=465.0mil; y2=65.8876mm; thickness=10.0mil; clearance=20.0mil;
+        x1=465.0mil; y1=67.31mm; x2=465.0mil; y2=2.594in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105141 {
-        x1=465.0mil; y1=65.8876mm; x2=842.0mil; y2=2.217in; thickness=10.0mil; clearance=20.0mil;
+        x1=465.0mil; y1=2.594in; x2=842.0mil; y2=2.217in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32162,13 +31990,13 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105147 {
-        x1=868.74mil; y1=2.217in; x2=870.0mil; y2=56.279796mm; thickness=10.0mil; clearance=20.0mil;
+        x1=868.74mil; y1=2.217in; x2=870.0mil; y2=2.21574in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105150 {
-        x1=920.0mil; y1=56.279796mm; x2=920.0mil; y2=2.52in; thickness=10.0mil; clearance=20.0mil;
+        x1=920.0mil; y1=2.21574in; x2=920.0mil; y2=2.52in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32180,7 +32008,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105156 {
-        x1=970.0mil; y1=56.279796mm; x2=970.0mil; y2=63.627mm; thickness=10.0mil; clearance=20.0mil;
+        x1=970.0mil; y1=2.21574in; x2=970.0mil; y2=63.627mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32192,7 +32020,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105282 {
-        x1=1.4502in; y1=1.833365in; x2=1.4502in; y2=2.13446in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.4502in; y1=46.567471mm; x2=1.4502in; y2=2.13446in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32204,7 +32032,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105288 {
-        x1=1.43052in; y1=1.833365in; x2=1.43052in; y2=2.16478in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.43052in; y1=46.567471mm; x2=1.43052in; y2=2.16478in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32216,7 +32044,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105348 {
-        x1=1.608in; y1=2.12526in; x2=39.3446mm; y2=2.18426in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.608in; y1=2.12526in; x2=1.549in; y2=2.18426in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32228,13 +32056,13 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105402 {
-        x1=36.576mm; y1=67.31mm; x2=36.576mm; y2=56.533796mm; thickness=10.0mil; clearance=20.0mil;
+        x1=1.44in; y1=67.31mm; x2=1.44in; y2=2.22574in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105405 {
-        x1=36.576mm; y1=56.533796mm; x2=36.83mm; y2=56.279796mm; thickness=10.0mil; clearance=20.0mil;
+        x1=1.44in; y1=2.22574in; x2=36.83mm; y2=2.21574in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32252,19 +32080,19 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105414 {
-        x1=1.468in; y1=2.512in; x2=1.468in; y2=57.092596mm; thickness=10.0mil; clearance=20.0mil;
+        x1=1.468in; y1=2.512in; x2=1.468in; y2=2.24774in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105417 {
-        x1=1.468in; y1=57.092596mm; x2=38.1mm; y2=56.279796mm; thickness=10.0mil; clearance=20.0mil;
+        x1=1.468in; y1=2.24774in; x2=38.1mm; y2=2.21574in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105420 {
-        x1=53.086mm; y1=67.31mm; x2=2.032in; y2=2.592in; thickness=10.0mil; clearance=20.0mil;
+        x1=2.09in; y1=67.31mm; x2=2.032in; y2=2.592in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32282,13 +32110,13 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105429 {
-        x1=1.499in; y1=2.498in; x2=1.499in; y2=57.575196mm; thickness=10.0mil; clearance=20.0mil;
+        x1=1.499in; y1=2.498in; x2=1.499in; y2=2.26674in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105432 {
-        x1=1.499in; y1=57.575196mm; x2=1.55in; y2=56.279796mm; thickness=10.0mil; clearance=20.0mil;
+        x1=1.499in; y1=2.26674in; x2=39.37mm; y2=2.21574in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32318,13 +32146,13 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105486 {
-        x1=1.528in; y1=2.482in; x2=1.528in; y2=58.108596mm; thickness=10.0mil; clearance=20.0mil;
+        x1=1.528in; y1=2.482in; x2=1.528in; y2=2.28774in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105489 {
-        x1=1.528in; y1=58.108596mm; x2=1.6in; y2=56.279796mm; thickness=10.0mil; clearance=20.0mil;
+        x1=1.528in; y1=2.28774in; x2=1.6in; y2=2.21574in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32342,13 +32170,13 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105534 {
-        x1=55.499mm; y1=1.596in; x2=56.178196mm; y2=1.596in; thickness=10.0mil; clearance=20.0mil;
+        x1=55.499mm; y1=1.596in; x2=2.21174in; y2=1.596in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105537 {
-        x1=56.178196mm; y1=1.596in; x2=2.8in; y2=2.18426in; thickness=10.0mil; clearance=20.0mil;
+        x1=2.21174in; y1=1.596in; x2=2.8in; y2=2.18426in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32366,7 +32194,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105546 {
-        x1=72.771mm; y1=64.897mm; x2=2.975in; y2=62.103mm; thickness=10.0mil; clearance=20.0mil;
+        x1=72.771mm; y1=64.897mm; x2=75.565mm; y2=62.103mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32377,80 +32205,44 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.105663 {
-        x1=104.1654mm; y1=3.064in; x2=3.99152in; y2=3.064in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.105666 {
-        x1=3.99152in; y1=3.064in; x2=3.986in; y2=3.06952in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.105669 {
-        x1=107.347004mm; y1=2.684in; x2=106.3752mm; y2=2.684in; thickness=10.0mil; clearance=20.0mil;
+        x1=4.22626in; y1=2.684in; x2=4.188in; y2=2.684in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105672 {
-        x1=4.19674in; y1=2.745in; x2=4.227in; y2=2.71474in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.105675 {
-        x1=1.174625in; y1=1.59716in; x2=25.522936mm; y2=1.59716in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.105678 {
-        x1=25.522936mm; y1=1.59716in; x2=999.0mil; y2=1.603in; thickness=10.0mil; clearance=20.0mil;
+        x1=4.19674in; y1=69.723mm; x2=4.227in; y2=2.71474in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105681 {
-        x1=1.174625in; y1=1.47905in; x2=28.29687mm; y2=1.47905in; thickness=10.0mil; clearance=20.0mil;
+        x1=29.835475mm; y1=37.56787mm; x2=28.29687mm; y2=37.56787mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105684 {
-        x1=28.29687mm; y1=1.47905in; x2=1.08in; y2=36.703mm; thickness=10.0mil; clearance=20.0mil;
+        x1=28.29687mm; y1=37.56787mm; x2=1.08in; y2=36.703mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105687 {
-        x1=1.08in; y1=36.703mm; x2=1.08in; y2=1.21574in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.105690 {
-        x1=1.08in; y1=1.18426in; x2=1.08in; y2=735.0mil; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.105693 {
-        x1=1.08in; y1=735.0mil; x2=470.0mil; y2=125.0mil; thickness=10.0mil; clearance=20.0mil;
+        x1=1.08in; y1=36.703mm; x2=1.08in; y2=1.21048in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105825 {
-        x1=1.41083in; y1=35.067875mm; x2=1.41083in; y2=30.900878mm; thickness=10.0mil; clearance=20.0mil;
+        x1=1.41083in; y1=35.067875mm; x2=1.41083in; y2=1.21657in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105828 {
-        x1=1.41083in; y1=30.900878mm; x2=35.814mm; y2=1.21574in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.41083in; y1=1.21657in; x2=1.41in; y2=1.21574in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32468,13 +32260,13 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105837 {
-        x1=1.4502in; y1=35.067875mm; x2=1.4502in; y2=32.398716mm; thickness=10.0mil; clearance=20.0mil;
+        x1=1.4502in; y1=35.067875mm; x2=1.4502in; y2=1.27554in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105840 {
-        x1=1.4502in; y1=32.398716mm; x2=1.51in; y2=1.21574in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.4502in; y1=1.27554in; x2=1.51in; y2=1.21574in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32486,13 +32278,13 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105870 {
-        x1=3.375in; y1=125.0mil; x2=3.375in; y2=132.0mil; thickness=10.0mil; clearance=20.0mil;
+        x1=85.725mm; y1=125.0mil; x2=85.725mm; y2=132.0mil; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105873 {
-        x1=3.375in; y1=132.0mil; x2=2.968in; y2=539.0mil; thickness=10.0mil; clearance=20.0mil;
+        x1=85.725mm; y1=132.0mil; x2=2.968in; y2=539.0mil; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32504,7 +32296,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105879 {
-        x1=2.05526in; y1=539.0mil; x2=35.814mm; y2=1.18426in; thickness=10.0mil; clearance=20.0mil;
+        x1=2.05526in; y1=539.0mil; x2=1.41in; y2=1.18426in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32516,13 +32308,13 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105891 {
-        x1=3.7in; y1=127.0mil; x2=81.534mm; y2=617.0mil; thickness=10.0mil; clearance=20.0mil;
+        x1=3.7in; y1=127.0mil; x2=3.21in; y2=617.0mil; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105894 {
-        x1=81.534mm; y1=617.0mil; x2=2.02726in; y2=617.0mil; thickness=10.0mil; clearance=20.0mil;
+        x1=3.21in; y1=617.0mil; x2=2.02726in; y2=617.0mil; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32534,19 +32326,19 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.105903 {
-        x1=4.025in; y1=125.0mil; x2=4.025in; y2=128.0mil; thickness=10.0mil; clearance=20.0mil;
+        x1=102.235mm; y1=125.0mil; x2=102.235mm; y2=128.0mil; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105906 {
-        x1=4.025in; y1=128.0mil; x2=87.6808mm; y2=701.0mil; thickness=10.0mil; clearance=20.0mil;
+        x1=102.235mm; y1=128.0mil; x2=3.452in; y2=701.0mil; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.105909 {
-        x1=87.6808mm; y1=701.0mil; x2=1.99326in; y2=701.0mil; thickness=10.0mil; clearance=20.0mil;
+        x1=3.452in; y1=701.0mil; x2=1.99326in; y2=701.0mil; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32557,98 +32349,86 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.105984 {
-        x1=100.0mil; y1=1.248in; x2=188.52mil; y2=1.248in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.105987 {
-        x1=188.52mil; y1=1.248in; x2=13.221208mm; y2=1.58in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.115862 {
-        x1=62.865mm; y1=61.6712mm; x2=62.862778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
+        x1=62.865mm; y1=2.428in; x2=62.862778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115865 {
-        x1=60.325mm; y1=61.6712mm; x2=60.322778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
+        x1=60.325mm; y1=2.428in; x2=60.322778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115868 {
-        x1=2.425in; y1=61.6712mm; x2=61.592778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
+        x1=61.595mm; y1=2.428in; x2=61.592778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115871 {
-        x1=64.135mm; y1=61.6712mm; x2=64.132778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
+        x1=64.135mm; y1=2.428in; x2=64.132778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115874 {
-        x1=65.405mm; y1=61.6712mm; x2=65.402778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
+        x1=65.405mm; y1=2.428in; x2=65.402778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115877 {
-        x1=2.325in; y1=61.6712mm; x2=59.052778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
+        x1=59.055mm; y1=2.428in; x2=59.052778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115880 {
-        x1=57.785mm; y1=61.6712mm; x2=57.782778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
+        x1=57.785mm; y1=2.428in; x2=57.782778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115883 {
-        x1=2.625in; y1=61.6712mm; x2=66.672778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
+        x1=66.675mm; y1=2.428in; x2=66.672778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115886 {
-        x1=2.675in; y1=2.30948in; x2=2.675in; y2=61.6712mm; thickness=10.0mil; clearance=20.0mil;
+        x1=67.945mm; y1=2.30948in; x2=67.945mm; y2=2.428in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115889 {
-        x1=2.675in; y1=60.135777mm; x2=67.942778mm; y2=60.137999mm; thickness=10.0mil; clearance=20.0mil;
+        x1=67.945mm; y1=60.135777mm; x2=67.942778mm; y2=60.137999mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115892 {
-        x1=69.215mm; y1=61.6712mm; x2=69.212778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
+        x1=69.215mm; y1=2.428in; x2=69.212778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115895 {
-        x1=70.485mm; y1=2.30948in; x2=70.485mm; y2=61.6712mm; thickness=10.0mil; clearance=20.0mil;
+        x1=70.485mm; y1=2.30948in; x2=70.485mm; y2=2.428in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115901 {
-        x1=2.825in; y1=61.6712mm; x2=71.752778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
+        x1=71.755mm; y1=2.428in; x2=71.752778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115904 {
-        x1=73.025mm; y1=61.6712mm; x2=73.022778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
+        x1=73.025mm; y1=2.428in; x2=73.022778mm; y2=61.668978mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32666,13 +32446,13 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.115913 {
-        x1=2.825in; y1=2.278in; x2=2.62252in; y2=2.278in; thickness=10.0mil; clearance=20.0mil;
+        x1=71.755mm; y1=2.278in; x2=2.62252in; y2=2.278in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115916 {
-        x1=2.82548in; y1=2.27848in; x2=2.825in; y2=2.278in; thickness=10.0mil; clearance=20.0mil;
+        x1=2.82548in; y1=2.27848in; x2=71.755mm; y2=2.278in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32684,7 +32464,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.115922 {
-        x1=71.752778mm; y1=58.663014mm; x2=2.825in; y2=2.30948in; thickness=10.0mil; clearance=20.0mil;
+        x1=71.752778mm; y1=58.663014mm; x2=71.755mm; y2=2.30948in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32696,7 +32476,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.115928 {
-        x1=66.672778mm; y1=58.663014mm; x2=2.625in; y2=2.30948in; thickness=10.0mil; clearance=20.0mil;
+        x1=66.672778mm; y1=58.663014mm; x2=66.675mm; y2=2.30948in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32708,13 +32488,13 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.115934 {
-        x1=59.052778mm; y1=58.893774mm; x2=58.819796mm; y2=2.30948in; thickness=10.0mil; clearance=20.0mil;
+        x1=59.052778mm; y1=58.893774mm; x2=2.31574in; y2=2.30948in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115937 {
-        x1=65.402778mm; y1=58.944574mm; x2=65.118996mm; y2=2.30948in; thickness=10.0mil; clearance=20.0mil;
+        x1=65.402778mm; y1=58.944574mm; x2=2.56374in; y2=2.30948in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32726,13 +32506,13 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.115943 {
-        x1=60.338208mm; y1=2.27848in; x2=60.325mm; y2=57.8866mm; thickness=10.0mil; clearance=20.0mil;
+        x1=2.37552in; y1=2.27848in; x2=60.325mm; y2=2.279in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.115946 {
-        x1=2.47452in; y1=2.27848in; x2=60.338208mm; y2=2.27848in; thickness=10.0mil; clearance=20.0mil;
+        x1=2.47452in; y1=2.27848in; x2=2.37552in; y2=2.27848in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32744,7 +32524,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.115952 {
-        x1=61.592778mm; y1=57.875614mm; x2=2.425in; y2=2.27848in; thickness=10.0mil; clearance=20.0mil;
+        x1=61.592778mm; y1=57.875614mm; x2=61.595mm; y2=2.27848in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32828,19 +32608,19 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.116147 {
-        x1=2.975in; y1=62.103mm; x2=2.975in; y2=2.32778in; thickness=10.0mil; clearance=20.0mil;
+        x1=75.565mm; y1=62.103mm; x2=75.565mm; y2=2.32778in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.116150 {
-        x1=2.975in; y1=2.32778in; x2=2.83148in; y2=2.18426in; thickness=10.0mil; clearance=20.0mil;
+        x1=75.565mm; y1=2.32778in; x2=2.83148in; y2=2.18426in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.116174 {
-        x1=2.782in; y1=2.116in; x2=56.2356mm; y2=1.548in; thickness=10.0mil; clearance=20.0mil;
+        x1=2.782in; y1=2.116in; x2=2.214in; y2=1.548in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32858,19 +32638,19 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.119134 {
-        x1=1.174625in; y1=1.45936in; x2=29.041344mm; y2=1.45936in; thickness=10.0mil; clearance=20.0mil;
+        x1=29.835475mm; y1=1.45936in; x2=1.14336in; y2=1.45936in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.119137 {
-        x1=29.041344mm; y1=1.45936in; x2=1.126in; y2=36.6268mm; thickness=10.0mil; clearance=20.0mil;
+        x1=1.14336in; y1=1.45936in; x2=1.126in; y2=1.442in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.119140 {
-        x1=1.126in; y1=36.6268mm; x2=1.126in; y2=1.256in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.126in; y1=1.442in; x2=1.126in; y2=1.256in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32882,19 +32662,19 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.119146 {
-        x1=1.54863in; y1=35.067875mm; x2=1.54863in; y2=34.324798mm; thickness=10.0mil; clearance=20.0mil;
+        x1=1.54863in; y1=35.067875mm; x2=1.54863in; y2=1.35137in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.119149 {
-        x1=1.54863in; y1=34.324798mm; x2=39.6494mm; y2=1.339in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.54863in; y1=1.35137in; x2=1.561in; y2=1.339in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
        ha:line.119152 {
-        x1=39.6494mm; y1=1.339in; x2=3.099in; y2=1.339in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.561in; y1=1.339in; x2=3.099in; y2=1.339in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32912,7 +32692,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.119161 {
-        x1=1.687in; y1=36.2204mm; x2=1.65364in; y2=1.45936in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.687in; y1=1.426in; x2=1.65364in; y2=1.45936in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -32960,7 +32740,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.119185 {
-        x1=1.233in; y1=1.867in; x2=31.0388mm; y2=1.856in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.233in; y1=1.867in; x2=1.222in; y2=1.856in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -33151,32 +32931,350 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.131210 {
-        x1=41.335071mm; y1=1.6562in; x2=1.4762in; y2=1.6562in; thickness=10.0mil; clearance=12.0mil;
+       ha:line.131222 {
+        x1=41.335071mm; y1=1.63652in; x2=1.78252in; y2=1.63652in; thickness=10.0mil; clearance=12.0mil;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.131213 {
-        x1=1.4762in; y1=1.6562in; x2=1.448in; y2=1.628in; thickness=10.0mil; clearance=12.0mil;
+       ha:line.131225 {
+        x1=1.78252in; y1=1.63652in; x2=1.832in; y2=1.686in; thickness=10.0mil; clearance=12.0mil;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.131216 {
-        x1=1.448in; y1=1.628in; x2=1.423in; y2=1.628in; thickness=10.0mil; clearance=12.0mil;
+       ha:line.137242 {
+        x1=1.52894in; y1=46.567471mm; x2=1.52894in; y2=1.79094in; thickness=10.0mil; clearance=12.0mil;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.131222 {
-        x1=41.335071mm; y1=1.63652in; x2=1.78252in; y2=1.63652in; thickness=10.0mil; clearance=12.0mil;
+       ha:line.137245 {
+        x1=1.52894in; y1=1.79094in; x2=1.499in; y2=1.761in; thickness=10.0mil; clearance=12.0mil;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.131225 {
-        x1=1.78252in; y1=1.63652in; x2=1.832in; y2=1.686in; thickness=10.0mil; clearance=12.0mil;
+       ha:line.137248 {
+        x1=1.499in; y1=1.761in; x2=1.363in; y2=1.761in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.137257 {
+        x1=1.633in; y1=1.84852in; x2=1.633in; y2=1.811in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.137260 {
+        x1=1.633in; y1=1.811in; x2=1.587in; y2=44.831mm; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.137263 {
+        x1=1.587in; y1=44.831mm; x2=1.587in; y2=1.704in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.137269 {
+        x1=41.335071mm; y1=1.6562in; x2=1.5978in; y2=1.6562in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.137272 {
+        x1=1.5978in; y1=1.6562in; x2=1.567in; y2=1.687in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.137275 {
+        x1=1.567in; y1=1.687in; x2=1.567in; y2=1.788in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.137278 {
+        x1=1.567in; y1=1.788in; x2=1.596in; y2=1.817in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.137281 {
+        x1=1.596in; y1=1.817in; x2=1.596in; y2=48.641mm; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.137284 {
+        x1=1.596in; y1=48.641mm; x2=1.629in; y2=1.948in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140354 {
+        x1=1.08in; y1=1.21048in; x2=1.13in; y2=1.16048in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140357 {
+        x1=1.13in; y1=1.129in; x2=1.13in; y2=125.0mil; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140426 {
+        x1=771.0mil; y1=1.58in; x2=770.0mil; y2=1.581in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140448 {
+        x1=741.52mil; y1=1.581in; x2=689.0mil; y2=1.581in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140451 {
+        x1=689.0mil; y1=1.581in; x2=688.0mil; y2=1.58in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140475 {
+        x1=63.0mil; y1=1.09in; x2=112.0mil; y2=1.139in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140478 {
+        x1=112.0mil; y1=1.139in; x2=112.0mil; y2=1.164in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140481 {
+        x1=112.0mil; y1=1.164in; x2=140.0mil; y2=1.192in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140484 {
+        x1=140.0mil; y1=1.192in; x2=468.0mil; y2=1.192in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140487 {
+        x1=468.0mil; y1=1.192in; x2=835.0mil; y2=1.559in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140502 {
+        x1=163.0mil; y1=1.14in; x2=452.0mil; y2=1.14in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140505 {
+        x1=452.0mil; y1=1.14in; x2=850.0mil; y2=1.538in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140517 {
+        x1=63.0mil; y1=990.0mil; x2=112.0mil; y2=1.039in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140520 {
+        x1=112.0mil; y1=1.039in; x2=112.0mil; y2=1.063in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140523 {
+        x1=112.0mil; y1=1.063in; x2=140.0mil; y2=1.091in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140526 {
+        x1=140.0mil; y1=1.091in; x2=500.0mil; y2=1.091in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140529 {
+        x1=500.0mil; y1=1.091in; x2=916.0mil; y2=1.507in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140538 {
+        x1=163.0mil; y1=1.04in; x2=500.0mil; y2=1.04in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140541 {
+        x1=500.0mil; y1=1.04in; x2=906.0mil; y2=1.446in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140547 {
+        x1=163.0mil; y1=940.0mil; x2=444.0mil; y2=940.0mil; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140550 {
+        x1=444.0mil; y1=940.0mil; x2=981.0mil; y2=1.477in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.146872 {
+        x1=41.783mm; y1=2.702in; x2=41.783mm; y2=2.74826in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.146875 {
+        x1=41.783mm; y1=2.74826in; x2=1.642in; y2=2.75126in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.146878 {
+        x1=42.799mm; y1=2.703in; x2=42.799mm; y2=2.74826in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.146881 {
+        x1=42.799mm; y1=2.74826in; x2=1.688in; y2=2.75126in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.146890 {
+        x1=1.642in; y1=2.78274in; x2=1.642in; y2=2.932in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.146893 {
+        x1=1.642in; y1=2.932in; x2=1.7in; y2=2.99in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.146896 {
+        x1=1.688in; y1=2.78274in; x2=1.688in; y2=2.878in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.146899 {
+        x1=1.688in; y1=2.878in; x2=1.8in; y2=2.99in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152777 {
+        x1=1.41083in; y1=2.53417in; x2=1.354in; y2=2.591in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.86418 {
+        x1=1.41083in; y1=2.49517in; x2=1.41083in; y2=2.53417in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152786 {
+        x1=1.353in; y1=2.75126in; x2=1.353in; y2=2.592in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152789 {
+        x1=1.353in; y1=2.592in; x2=1.356in; y2=2.589in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152794 {
+        x1=33.147mm; y1=2.75126in; x2=33.147mm; y2=2.591in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152797 {
+        x1=1.39116in; y1=2.50484in; x2=33.147mm; y2=2.591in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152800 {
+        x1=1.03in; y1=2.99in; x2=1.03in; y2=2.959in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152803 {
+        x1=1.03in; y1=2.959in; x2=1.08in; y2=2.909in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152806 {
+        x1=1.08in; y1=2.909in; x2=1.261in; y2=2.909in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152809 {
+        x1=1.261in; y1=2.909in; x2=33.147mm; y2=72.771mm; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152812 {
+        x1=33.147mm; y1=72.771mm; x2=33.147mm; y2=2.78274in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152815 {
+        x1=1.23in; y1=2.99in; x2=1.353in; y2=2.867in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152818 {
+        x1=1.353in; y1=2.867in; x2=1.353in; y2=2.78274in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152821 {
+        x1=3.95826in; y1=3.101in; x2=3.99526in; y2=3.064in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.152827 {
+        x1=4.02674in; y1=3.064in; x2=4.101in; y2=3.064in; thickness=10.0mil; clearance=12.0mil;
         ha:flags {
          clearline=1
         }
@@ -33189,7 +33287,7 @@ ha:pcb-rnd-board-v5 {
      lid=1
      group=5
      ha:combining {     }
-     visible=1
+     visible=0
 
       li:objects {
        ha:polygon.4447 {
@@ -33215,7 +33313,7 @@ ha:pcb-rnd-board-v5 {
      lid=2
      group=7
      ha:combining {     }
-     visible=1
+     visible=0
 
       li:objects {
        ha:line.4452 {
@@ -33284,12 +33382,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.13762 {
-        x1=4.118102mm; y1=950.11mil; x2=168.11mil; y2=950.11mil; thickness=25.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.104237 {
         x1=2.988in; y1=65.2526mm; x2=81.3308mm; y2=70.6882mm; thickness=25.0mil; clearance=20.0mil;
         ha:flags {
@@ -33308,14 +33400,8 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.105966 {
-        x1=4.118102mm; y1=950.11mil; x2=2.10711in; y2=950.11mil; thickness=25.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.105969 {
-        x1=2.10711in; y1=950.11mil; x2=3.199in; y2=2.042in; thickness=25.0mil; clearance=20.0mil;
+        x1=59.69mm; y1=1.193in; x2=3.199in; y2=2.042in; thickness=25.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -33332,6 +33418,18 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
+       ha:line.140387 {
+        x1=163.0mil; y1=1.24in; x2=210.0mil; y2=1.193in; thickness=25.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.149841 {
+        x1=210.0mil; y1=1.193in; x2=59.69mm; y2=1.193in; thickness=25.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
        ha:polygon.4578 {
         li:geometry {
           ta:contour {
@@ -33406,48 +33504,12 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.4793 {
-        x1=430.0mil; y1=2.99in; x2=430.0mil; y2=75.9206mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.4874 {
-        x1=430.0mil; y1=2.99in; x2=430.0mil; y2=2.988in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.13876 {
-        x1=4.118102mm; y1=750.11mil; x2=4.118102mm; y2=19.053302mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.13892 {
-        x1=62.13mil; y1=700.11mil; x2=62.13mil; y2=17.783302mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.50234 {
         x1=691.0mil; y1=1.783in; x2=692.0mil; y2=1.783in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.52557 {
-        x1=62.0mil; y1=685.0mil; x2=62.0mil; y2=699.98mil; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.52560 {
-        x1=62.0mil; y1=699.98mil; x2=62.13mil; y2=700.11mil; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.55907 {
         x1=1.625in; y1=61.671709mm; x2=41.278498mm; y2=61.675207mm; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -33460,48 +33522,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.61102 {
-        x1=830.0mil; y1=75.94603mm; x2=21.48837mm; y2=75.94603mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.61559 {
-        x1=967.0mil; y1=2.804in; x2=852.0mil; y2=2.919in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.61562 {
-        x1=852.0mil; y1=2.919in; x2=17.80543mm; y2=2.919in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.61565 {
-        x1=17.80543mm; y1=2.919in; x2=630.0mil; y2=75.94603mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.61794 {
-        x1=945.0mil; y1=2.796in; x2=843.0mil; y2=2.898in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.61797 {
-        x1=843.0mil; y1=2.898in; x2=522.0011811mil; y2=2.898in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.61800 {
-        x1=522.0011811mil; y1=2.898in; x2=430.0mil; y2=75.94603mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.64202 {
         x1=36.195mm; y1=1.674in; x2=36.195mm; y2=2.358in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -33515,7 +33535,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.64208 {
-        x1=1.685in; y1=66.4972mm; x2=1.685in; y2=2.803in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.685in; y1=66.4972mm; x2=1.685in; y2=2.703in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -33527,7 +33547,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.64556 {
-        x1=41.783mm; y1=2.803in; x2=41.783mm; y2=2.609in; thickness=10.0mil; clearance=20.0mil;
+        x1=41.783mm; y1=2.702in; x2=41.783mm; y2=2.609in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -33622,12 +33642,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.93916 {
-        x1=1.363in; y1=1.688in; x2=1.423in; y2=1.628in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.94033 {
         x1=40.767mm; y1=1.832in; x2=39.6494mm; y2=1.876in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -33658,98 +33672,8 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.97635 {
-        x1=1.253in; y1=1.656in; x2=1.253in; y2=1.761in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97638 {
-        x1=1.253in; y1=1.761in; x2=1.187in; y2=1.827in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97641 {
-        x1=1.187in; y1=1.827in; x2=1.187in; y2=2.583in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97644 {
-        x1=1.187in; y1=2.583in; x2=1.48in; y2=73.0504mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97647 {
-        x1=1.48in; y1=73.0504mm; x2=60.604394mm; y2=73.0504mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97650 {
-        x1=60.604394mm; y1=73.0504mm; x2=63.500024mm; y2=75.94603mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97707 {
-        x1=945.0mil; y1=2.796in; x2=945.0mil; y2=1.665in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97710 {
-        x1=967.0mil; y1=2.804in; x2=967.0mil; y2=1.687in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97713 {
-        x1=967.0mil; y1=1.687in; x2=972.0mil; y2=1.682in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97716 {
-        x1=972.0mil; y1=1.682in; x2=972.0mil; y2=1.634in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97719 {
-        x1=830.0mil; y1=75.94603mm; x2=988.0mil; y2=71.93283mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97722 {
-        x1=988.0mil; y1=1.695in; x2=999.0mil; y2=1.684in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97725 {
-        x1=999.0mil; y1=1.684in; x2=999.0mil; y2=1.603in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.97813 {
-        x1=2.966in; y1=2.398in; x2=2.966in; y2=2.668in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97816 {
-        x1=2.966in; y1=2.668in; x2=2.7in; y2=2.934in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97819 {
-        x1=2.7in; y1=2.934in; x2=2.7in; y2=75.946006mm; thickness=10.0mil; clearance=20.0mil;
+        x1=2.966in; y1=2.398in; x2=2.966in; y2=2.649in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -33773,25 +33697,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.97855 {
-        x1=2.987in; y1=2.389in; x2=2.987in; y2=2.842in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97858 {
-        x1=2.987in; y1=2.842in; x2=73.66mm; y2=2.929in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97861 {
-        x1=73.66mm; y1=2.929in; x2=73.66mm; y2=75.946006mm; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.97864 {
-        x1=73.66mm; y1=75.946006mm; x2=73.660024mm; y2=75.94603mm; thickness=10.0mil; clearance=20.0mil;
+        x1=2.987in; y1=2.389in; x2=2.987in; y2=2.828in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -33905,7 +33811,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:line.104646 {
-        x1=1.363in; y1=57.1754mm; x2=1.363in; y2=1.688in; thickness=10.0mil; clearance=20.0mil;
+        x1=1.363in; y1=57.1754mm; x2=1.363in; y2=1.761in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
          clearline=1
         }
@@ -33976,12 +33882,6 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:line.105960 {
-        x1=988.0mil; y1=71.93283mm; x2=988.0mil; y2=1.695in; thickness=10.0mil; clearance=20.0mil;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.115961 {
         x1=2.966in; y1=2.33748in; x2=2.507in; y2=1.87848in; thickness=10.0mil; clearance=20.0mil;
         ha:flags {
@@ -34000,6 +33900,24 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
+       ha:line.146849 {
+        x1=2.987in; y1=2.828in; x2=71.755mm; y2=2.99in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.146852 {
+        x1=2.966in; y1=2.649in; x2=66.675mm; y2=2.99in; thickness=10.0mil; clearance=20.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.149835 {
+        x1=163.0mil; y1=650.0mil; x2=688.0mil; y2=1.58in; thickness=10.0mil; clearance=12.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
        ha:polygon.4919 {
         li:geometry {
           ta:contour {
@@ -34058,7 +33976,7 @@ ha:pcb-rnd-board-v5 {
       color = {#548b54}
     }
 
-    {ha:bottom silk}                                                                 {
+    {ha:bottom silk}                                                                                  {
      lid=5
      group=12
      ha:combining { auto=1;     }
@@ -34087,7 +34005,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:text.4942 {
-        string=Y; x=300.0mil; y=4.0mil; scale=200; fid=0; direction=2;
+        string=Y; x=962.0mil; y=13.0mil; scale=200; fid=0; direction=2;
         ha:flags {
          clearline=1
          onsolder=1
@@ -34164,7 +34082,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:text.4953 {
-        string=PAD; x=464.0mil; y=276.0mil; scale=100; fid=0; direction=2;
+        string=PAD; x=1.129in; y=276.0mil; scale=100; fid=0; direction=2;
         ha:flags {
          clearline=1
          onsolder=1
@@ -34198,13 +34116,6 @@ ha:pcb-rnd-board-v5 {
          onsolder=1
         }
        }
-       ha:text.4958 {
-        string=charged; x=101.0158mm; y=3.023in; scale=100; fid=0; direction=2;
-        ha:flags {
-         clearline=1
-         onsolder=1
-        }
-       }
        ha:text.4959 {
         string=Cont 1; x=2.813in; y=2.817in; scale=100; fid=0; direction=2;
         ha:flags {
@@ -34241,7 +34152,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:text.4964 {
-        string=Cont 6; x=30.2768mm; y=2.817in; scale=100; fid=0; direction=2;
+        string=Cont 6; x=1.192in; y=2.817in; scale=100; fid=0; direction=2;
         ha:flags {
          clearline=1
          onsolder=1
@@ -34262,7 +34173,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:text.4967 {
-        string=Y; x=92.202mm; y=8.0mil; scale=200; fid=0; direction=2;
+        string=Y; x=3.63in; y=8.0mil; scale=200; fid=0; direction=2;
         ha:flags {
          clearline=1
          onsolder=1
@@ -34275,11 +34186,39 @@ ha:pcb-rnd-board-v5 {
          onsolder=1
         }
        }
+       ha:text.140324 {
+        string=DRAG; x=372.0mil; y=573.0mil; scale=100; fid=0; direction=2;
+        ha:flags {
+         clearline=1
+         onsolder=1
+        }
+       }
+       ha:text.140325 {
+        string=RACE; x=369.0mil; y=648.0mil; scale=100; fid=0; direction=2;
+        ha:flags {
+         clearline=1
+         onsolder=1
+        }
+       }
+       ha:text.140327 {
+        string=B; x=69.0mil; y=427.0mil; scale=200; fid=0; direction=2;
+        ha:flags {
+         clearline=1
+         onsolder=1
+        }
+       }
+       ha:text.4958 {
+        string=charged; x=101.0158mm; y=2.98in; scale=100; fid=0; direction=2;
+        ha:flags {
+         clearline=1
+         onsolder=1
+        }
+       }
       }
       color = {#000000}
     }
 
-    {ha:top silk}                                                                 {
+    {ha:top silk}                                                                                  {
      lid=6
      group=1
      ha:combining { auto=1;     }
@@ -34334,36 +34273,12 @@ ha:pcb-rnd-board-v5 {
         }
 
        }
-       ha:text.4969 {
-        string=B; x=180.0mil; y=27.559mm; scale=200; fid=0; direction=0;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:text.4970 {
-        string=DRAG; x=250.0mil; y=1.23in; scale=100; fid=0; direction=0;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:text.4971 {
-        string=RACE; x=252.0mil; y=1.292in; scale=100; fid=0; direction=0;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:text.4972 {
         string=debug; x=1.423in; y=212.0mil; scale=100; fid=0; direction=0;
         ha:flags {
          clearline=1
         }
        }
-       ha:text.4974 {
-        string=Arm; x=2.971in; y=2.784in; scale=150; fid=0; direction=0;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:text.4975 {
         string=only!; x=211.0mil; y=2.72in; scale=150; fid=0; direction=0;
         ha:flags {
@@ -34377,7 +34292,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:text.4978 {
-        string=Fire LED; x=2.798in; y=2.843in; scale=150; fid=0; direction=1;
+        string=Fire LED; x=2.779in; y=2.843in; scale=150; fid=0; direction=1;
         ha:flags {
          clearline=1
         }
@@ -34395,13 +34310,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:text.4981 {
-        string=Fire; x=2.591in; y=72.263mm; scale=150; fid=0; direction=1;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:text.4983 {
-        string=Select; x=942.0mil; y=2.825in; scale=150; fid=0; direction=1;
+        string=Fire; x=2.58in; y=2.843in; scale=150; fid=0; direction=1;
         ha:flags {
          clearline=1
         }
@@ -34425,7 +34334,7 @@ ha:pcb-rnd-board-v5 {
         }
        }
        ha:text.13904 {
-        string=companion; x=20.0mil; y=407.0mil; scale=100; fid=0; direction=0;
+        string=companion; x=210.0mil; y=1.347in; scale=100; fid=0; direction=1;
         ha:flags {
          clearline=1
         }
@@ -34436,26 +34345,38 @@ ha:pcb-rnd-board-v5 {
          clearline=1
         }
        }
-       ha:text.4982 {
-        string=Mode; x=1.148in; y=2.827in; scale=150; fid=0; direction=1;
+       ha:text.4973 {
+        string=On/Off; x=3.184in; y=2.778in; scale=150; fid=0; direction=0;
         ha:flags {
          clearline=1
         }
        }
-       ha:text.103966 {
-        string=v3.0p2; x=78.486mm; y=774.0mil; scale=250; fid=0; direction=0;
+       ha:text.104630 {
+        string=1S; x=207.0mil; y=2.56in; scale=150; fid=0; direction=0;
         ha:flags {
          clearline=1
         }
        }
-       ha:text.4973 {
-        string=On/Off; x=81.7626mm; y=70.6882mm; scale=150; fid=0; direction=0;
+       ha:text.140329 {
+        string=v3.0; x=3.09in; y=774.0mil; scale=250; fid=0; direction=0;
         ha:flags {
          clearline=1
         }
        }
-       ha:text.104630 {
-        string=1S; x=207.0mil; y=2.56in; scale=150; fid=0; direction=0;
+       ha:text.146856 {
+        string=Arm; x=2.96in; y=2.777in; scale=150; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.152776 {
+        string=Select; x=983.0mil; y=2.831in; scale=150; fid=0; direction=1;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.152793 {
+        string=Mode; x=1.183in; y=2.824in; scale=150; fid=0; direction=1;
         ha:flags {
          clearline=1
         }
@@ -36536,7 +36457,7 @@ ha:pcb-rnd-board-v5 {
      li:conn { R51-2; U4-53;     }
      }
      ha:GND {
-     li:conn { B1-2; C1-2; C2-2; C3-1; C5-1; C6-1; C7-1; C10-1; C11-1; C12-1; C13-1; C14-1; C30-2; C31-2; C32-2; C33-2; C37-1; C42-1; C43-1; C44-1; C45-1; C47-1; C171-1; C172-1; C175-1; C210-2; C211-2; C221-1; C251-2; C261-2; C271-2; C291-2; C601-2; C602-2; C604-1; C605-1; C606-1; C607-1; C610-1; D3-2; D4-2; D5-2; D6-2; D7-2; D9-2; D10-2; D11-2; D12-2; D13-2; D14-2; D15-2; D16-2; D17-2; D18-2; H1-1; H2-1; H3-1; H4-1; H5-1; H6-1; J1-4; J1-5; J2-4; J2-6; J2-8; J3-1; J4-2; J4-4; J4-6; J4-8; J8-2; J9-1; J100-1; J100-2; L192-2; Q1-1; R4-1; R14-1; R15-1; R30-1; R31-2; R33-2; U1-2; U1-4; U2-2; U3-2; U4-12; U4-18; U4-28; U4-31; U4-47; U4-60; U4-63; U6-32; U6-33; U8-1; X1-2; X1-4; X2-2; X2-4; X3-15; X3-27; X3-28;     }
+     li:conn { B1-2; C1-2; C2-2; C3-1; C5-1; C6-1; C7-1; C10-1; C11-1; C12-1; C13-1; C14-1; C30-2; C31-2; C32-2; C33-2; C37-1; C42-1; C43-1; C44-1; C45-1; C47-1; C171-1; C172-1; C175-1; C210-2; C211-2; C221-1; C251-2; C261-2; C271-2; C291-2; C601-2; C602-2; C604-1; C605-1; C606-1; C607-1; C610-1; D3-2; D4-2; D5-2; D6-2; D7-2; D9-2; D10-2; D11-2; D12-2; D13-2; D14-2; D15-2; D16-2; D17-2; D18-2; H1-1; H2-1; H3-1; H4-1; H5-1; H6-1; J1-4; J1-5; J2-4; J3-2; J3-4; J4-2; J4-4; J5-1; J8-2; J9-1; J100-1; J100-2; L192-2; Q1-1; R4-1; R14-1; R15-1; R30-1; R31-2; R33-2; U1-2; U1-4; U2-2; U3-2; U4-12; U4-18; U4-28; U4-31; U4-47; U4-60; U4-63; U6-32; U6-33; U8-1; X1-2; X1-4; X2-2; X2-4; X3-15; X3-27; X3-28;     }
      }
      ha:miso2 {
      li:conn { J9-4; U4-35; U6-9;     }
@@ -36548,7 +36469,7 @@ ha:pcb-rnd-board-v5 {
      li:conn { R4-2; R5-1; U4-16;     }
      }
      ha:swclk {
-     li:conn { J3-4; U4-49;     }
+     li:conn { J5-4; U4-49;     }
      }
      ha:vdda {
      li:conn { C601-1; C602-1; L600-2; U4-13;     }
@@ -36559,30 +36480,18 @@ ha:pcb-rnd-board-v5 {
      ha:encoder_b {
      li:conn { J100-4; R2-1; U4-30;     }
      }
-     ha:spare1 {
-     li:conn { J4-5; U4-56;     }
-     }
-     ha:spare2 {
-     li:conn { J4-7; U4-57;     }
-     }
-     ha:spare3 {
-     li:conn { J4-9; U4-58;     }
-     }
-        ha:spare4 {
-        li:conn { J2-9; U4-59;        }
-        }
        ha:swdio {
-       li:conn { J3-3; U4-46;       }
-       }
-                                  ha:v_lipo {
-                                  li:conn { C5-2; J2-2; J9-8; R5-2; U1-1; U1-3;                                  }
-                                  }
-                                 ha:cs_companion0 {
-                                 li:conn { J9-6; U4-51;                                 }
-                                 }
-                                 ha:cs_companion1 {
-                                 li:conn { J9-5; U4-52;                                 }
-                                 }
+       li:conn { J5-3; U4-46;       }
+       }
+                                              ha:v_lipo {
+                                              li:conn { C5-2; J2-2; J9-8; R5-2; U1-1; U1-3;                                              }
+                                              }
+                                             ha:cs_companion0 {
+                                             li:conn { J9-6; U4-51;                                             }
+                                             }
+                                             ha:cs_companion1 {
+                                             li:conn { J9-5; U4-52;                                             }
+                                             }
      ha:unnamed_net1 {
      li:conn { C33-1; U4-6; X2-3;     }
      }
@@ -36617,7 +36526,7 @@ ha:pcb-rnd-board-v5 {
      li:conn { R40-2; U4-27;     }
      }
      ha:continuity_2 {
-     li:conn { R41-2; U4-15;     }
+     li:conn { R41-2; U4-22;     }
      }
      ha:continuity_3 {
      li:conn { R42-2; U4-14;     }
@@ -36685,170 +36594,170 @@ ha:pcb-rnd-board-v5 {
       ha:a0_lcd {
       li:conn { U4-17; X3-3;      }
       }
-               ha:unnamed_net19 {
-               li:conn { C30-1; U6-31; X1-3;               }
-               }
-               ha:unnamed_net24 {
-               li:conn { C191-1; L191-1; L192-1; U6-19;               }
-               }
-              ha:unnamed_net18 {
-              li:conn { C177-2; J8-1; L174-2;              }
-              }
-               ha:unnamed_net27 {
-               li:conn { C231-1; U6-24;               }
-               }
-               ha:unnamed_net25 {
-               li:conn { C181-2; L193-1; U6-18;               }
-               }
-               ha:unnamed_net28 {
-               li:conn { C231-2; U6-23;               }
-               }
-              ha:unnamed_net15 {
-              li:conn { R101-2; U4-44;              }
-              }
-               ha:unnamed_net35 {
-               li:conn { C173-2; L171-1; R171-2;               }
-               }
-                ha:unnamed_net37 {
-                li:conn { C176-2; C181-1; L172-2; L173-1;                }
-                }
-                ha:unnamed_net23 {
-                li:conn { C210-1; L191-2; L201-1; U6-20;                }
-                }
-                ha:unnamed_net38 {
-                li:conn { C175-2; C177-1; L173-2; L174-1;                }
-                }
-                ha:unnamed_net30 {
-                li:conn { R30-2; U6-14;                }
-                }
-               ha:unnamed_net26 {
-               li:conn { C174-1; L171-2; U6-17;               }
-               }
-               ha:mosi1 {
-               li:conn { U4-23; X3-13;               }
-               }
-               ha:unnamed_net33 {
-               li:conn { C261-1; U6-26;               }
-               }
-               ha:unnamed_net29 {
-               li:conn { C211-1; U6-21;               }
-               }
-               ha:unnamed_net40 {
-               li:conn { D13-1; R60-2;               }
-               }
-               ha:mosi2 {
-               li:conn { J9-3; U4-36; U6-7;               }
-               }
-               ha:unnamed_net42 {
-               li:conn { D15-1; R40-1;               }
-               }
-               ha:unnamed_net43 {
-               li:conn { D16-1; R41-1;               }
-               }
-               ha:unnamed_net39 {
-               li:conn { C191-2; L193-2; L201-2;               }
-               }
-               ha:unnamed_net45 {
-               li:conn { D18-1; R43-1;               }
-               }
-               ha:unnamed_net36 {
-               li:conn { C174-2; C176-1; L172-1;               }
-               }
-               ha:unnamed_net66 {
-               li:conn { C9-1; X3-20;               }
-               }
-              ha:unnamed_net20 {
-              li:conn { C31-1; U6-30; X1-1;              }
-              }
-               ha:reset_n {
-               li:conn { C610-2; J3-2; U4-7; U6-2;               }
-               }
-                ha:unnamed_net34 {
-                li:conn { C291-1; U6-29;                }
-                }
-                ha:unnamed_net46 {
-                li:conn { D8-1; L1-2; U3-1;                }
-                }
-                ha:unnamed_net47 {
-                li:conn { R32-2; R33-1; U3-3;                }
-                }
-                ha:unnamed_net67 {
-                li:conn { C9-2; X3-21;                }
-                }
-                ha:unnamed_net49 {
-                li:conn { R20-2; U4-20;                }
-                }
-               ha:unnamed_net44 {
-               li:conn { D17-1; R42-1;               }
-               }
-                ha:unnamed_net50 {
-                li:conn { R21-1; U4-41;                }
-                }
-                ha:unnamed_net62 {
-                li:conn { C3-2; X3-16;                }
-                }
-                ha:unnamed_net68 {
-                li:conn { C10-2; X3-22;                }
-                }
-                ha:unnamed_net48 {
-                li:conn { D9-1; R51-1;                }
-                }
-               ha:unnamed_net65 {
-               li:conn { C8-2; X3-19;               }
-               }
-               ha:unnamed_net71 {
-               li:conn { C12-2; X3-24;               }
-               }
-               ha:unnamed_net72 {
-               li:conn { C14-2; X3-26;               }
-               }
-               ha:unnamed_net73 {
-               li:conn { Q1-2; R3-1;               }
-               }
-               ha:unnamed_net51 {
-               li:conn { R22-1; U4-9;               }
-               }
-               ha:unnamed_net52 {
-               li:conn { R23-1; U4-8;               }
-               }
-               ha:unnamed_net70 {
-               li:conn { C13-2; X3-25;               }
-               }
-               ha:unnamed_net41 {
-               li:conn { D14-1; R61-2;               }
-               }
-               ha:unnamed_net69 {
-               li:conn { C11-2; X3-23;               }
-               }
-               ha:unnamed_net63 {
-               li:conn { C4-2; X3-17;               }
-               }
-              ha:unnamed_net59 {
-              li:conn { Q1-7; Q1-8; X3-K;              }
-              }
-               ha:usbdp {
-               li:conn { J1-3; R102-1;               }
-               }
-               ha:unnamed_net74 {
-               li:conn { R29-1; U4-43;               }
-               }
-               ha:unnamed_net75 {
-               li:conn { U4-37; U8-2;               }
-               }
-               ha:unnamed_net64 {
-               li:conn { C4-1; C8-1; X3-18;               }
-               }
-              ha:unnamed_net32 {
-              li:conn { C42-2; U6-6;              }
-              }
-                 ha:rf_good {
-                 li:conn { R53-2; U4-40;                 }
-                 }
-                ha:usbdm {
-                li:conn { J1-2; R101-1;                }
-                }
+                           ha:unnamed_net19 {
+                           li:conn { C30-1; U6-31; X1-3;                           }
+                           }
+                           ha:unnamed_net24 {
+                           li:conn { C191-1; L191-1; L192-1; U6-19;                           }
+                           }
+                          ha:unnamed_net18 {
+                          li:conn { J8-1; L174-2;                          }
+                          }
+                           ha:unnamed_net27 {
+                           li:conn { C231-1; U6-24;                           }
+                           }
+                           ha:unnamed_net25 {
+                           li:conn { C181-2; L193-1; U6-18;                           }
+                           }
+                           ha:unnamed_net28 {
+                           li:conn { C231-2; U6-23;                           }
+                           }
+                          ha:unnamed_net15 {
+                          li:conn { R101-2; U4-44;                          }
+                          }
+                           ha:unnamed_net35 {
+                           li:conn { C173-2; L171-1; R171-2;                           }
+                           }
+                           ha:unnamed_net26 {
+                           li:conn { C174-1; L171-2; U6-17;                           }
+                           }
+                          ha:unnamed_net23 {
+                          li:conn { C210-1; L191-2; L201-1; U6-20;                          }
+                          }
+                           ha:unnamed_net38 {
+                           li:conn { C175-2; L173-2; L174-1;                           }
+                           }
+                          ha:unnamed_net20 {
+                          li:conn { C31-1; U6-30; X1-1;                          }
+                          }
+                           ha:unnamed_net40 {
+                           li:conn { D13-1; R60-2;                           }
+                           }
+                           ha:mosi1 {
+                           li:conn { U4-23; X3-13;                           }
+                           }
+                          ha:unnamed_net33 {
+                          li:conn { C261-1; U6-26;                          }
+                          }
+                          ha:unnamed_net29 {
+                          li:conn { C211-1; U6-21;                          }
+                          }
+                           ha:unnamed_net30 {
+                           li:conn { R30-2; U6-14;                           }
+                           }
+                          ha:mosi2 {
+                          li:conn { J9-3; U4-36; U6-7;                          }
+                          }
+                           ha:unnamed_net37 {
+                           li:conn { C176-2; C181-1; L172-2; L173-1;                           }
+                           }
+                           ha:unnamed_net43 {
+                           li:conn { D16-1; R41-1;                           }
+                           }
+                           ha:unnamed_net39 {
+                           li:conn { C191-2; L193-2; L201-2;                           }
+                           }
+                           ha:unnamed_net45 {
+                           li:conn { D18-1; R43-1;                           }
+                           }
+                           ha:unnamed_net36 {
+                           li:conn { C174-2; C176-1; L172-1;                           }
+                           }
+                           ha:unnamed_net66 {
+                           li:conn { C9-1; X3-20;                           }
+                           }
+                           ha:reset_n {
+                           li:conn { C610-2; J5-2; U4-7; U6-2;                           }
+                           }
+                           ha:unnamed_net44 {
+                           li:conn { D17-1; R42-1;                           }
+                           }
+                          ha:unnamed_net34 {
+                          li:conn { C291-1; U6-29;                          }
+                          }
+                           ha:unnamed_net68 {
+                           li:conn { C10-2; X3-22;                           }
+                           }
+                           ha:unnamed_net47 {
+                           li:conn { R32-2; R33-1; U3-3;                           }
+                           }
+                          ha:unnamed_net63 {
+                          li:conn { C4-2; X3-17;                          }
+                          }
+                           ha:unnamed_net49 {
+                           li:conn { R20-2; U4-20;                           }
+                           }
+                           ha:unnamed_net69 {
+                           li:conn { C11-2; X3-23;                           }
+                           }
+                          ha:unnamed_net50 {
+                          li:conn { R21-1; U4-41;                          }
+                          }
+                           ha:unnamed_net62 {
+                           li:conn { C3-2; X3-16;                           }
+                           }
+                           ha:unnamed_net73 {
+                           li:conn { Q1-2; R3-1;                           }
+                           }
+                           ha:unnamed_net59 {
+                           li:conn { Q1-7; Q1-8; X3-K;                           }
+                           }
+                           ha:unnamed_net42 {
+                           li:conn { D15-1; R40-1;                           }
+                           }
+                           ha:unnamed_net71 {
+                           li:conn { C12-2; X3-24;                           }
+                           }
+                           ha:unnamed_net67 {
+                           li:conn { C9-2; X3-21;                           }
+                           }
+                           ha:unnamed_net32 {
+                           li:conn { C42-2; U6-6;                           }
+                           }
+                          ha:unnamed_net46 {
+                          li:conn { D8-1; L1-2; U3-1;                          }
+                          }
+                           ha:unnamed_net52 {
+                           li:conn { R23-1; U4-8;                           }
+                           }
+                            ha:unnamed_net65 {
+                            li:conn { C8-2; X3-19;                            }
+                            }
+                           ha:unnamed_net41 {
+                           li:conn { D14-1; R61-2;                           }
+                           }
+                            ha:unnamed_net72 {
+                            li:conn { C14-2; X3-26;                            }
+                            }
+                            ha:unnamed_net74 {
+                            li:conn { R29-1; U4-43;                            }
+                            }
+                            ha:unnamed_net75 {
+                            li:conn { U4-37; U8-2;                            }
+                            }
+                            ha:unnamed_net64 {
+                            li:conn { C4-1; C8-1; X3-18;                            }
+                            }
+                            ha:unnamed_net70 {
+                            li:conn { C13-2; X3-25;                            }
+                            }
+                            ha:unnamed_net48 {
+                            li:conn { D9-1; R51-1;                            }
+                            }
+                            ha:usbdp {
+                            li:conn { J1-3; R102-1;                            }
+                            }
+                           ha:unnamed_net51 {
+                           li:conn { R22-1; U4-9;                           }
+                           }
+                           ha:usbdm {
+                           li:conn { J1-2; R101-1;                           }
+                           }
+                           ha:rf_good {
+                           li:conn { R53-2; U4-40;                           }
+                           }
      ha:fire {
-     li:conn { J2-7; R20-1;     }
+     li:conn { J3-3; R20-1;     }
      }
      ha:encoder_select {
      li:conn { J100-3; U4-29;     }
@@ -36860,7 +36769,7 @@ ha:pcb-rnd-board-v5 {
     li:conn { J2-3; R21-2;    }
     }
      ha:fire12V {
-     li:conn { C2-1; D8-2; J2-5; R32-1;     }
+     li:conn { C2-1; D8-2; J3-1; R32-1;     }
      }
      ha:cs_radio {
      li:conn { U4-61; U6-11;     }
@@ -36869,7 +36778,7 @@ ha:pcb-rnd-board-v5 {
      li:conn { R52-2; U4-38;     }
      }
       ha:bl_lcd {
-      li:conn { R3-2; U4-22;      }
+      li:conn { R3-2; U4-15;      }
       }
      ha:v_usb {
      li:conn { C6-2; J1-1; R11-2; U2-4;     }