diff --git a/usb-c_cable_tester.lht b/usb-c_cable_tester.lht
index ed5fb6a..a4a07c7 100644
--- a/usb-c_cable_tester.lht
+++ b/usb-c_cable_tester.lht
@@ -221,82 +221,6 @@ ha:pcb-rnd-board-v8 {
   }
 
    li:objects {
-     ha:padstack_ref.15415 {
-      proto=0; x=52.1mm; y=13.9mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-      ha:flags {
-       clearline=1
-      }
-
-      li:thermal {
-        li:2 {
-         on  
-         solid  
-         noshape  
-        }
-        li:3 {
-         on  
-         solid  
-         noshape  
-        }
-      }
-     }
-     ha:padstack_ref.15416 {
-      proto=0; x=52.1mm; y=21.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-      ha:flags {
-       clearline=1
-      }
-
-      li:thermal {
-        li:2 {
-         on  
-         solid  
-         noshape  
-        }
-        li:3 {
-         on  
-         solid  
-         noshape  
-        }
-      }
-     }
-     ha:padstack_ref.15417 {
-      proto=0; x=44.9mm; y=21.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-      ha:flags {
-       clearline=1
-      }
-
-      li:thermal {
-        li:2 {
-         on  
-         solid  
-         noshape  
-        }
-        li:3 {
-         on  
-         solid  
-         noshape  
-        }
-      }
-     }
-     ha:padstack_ref.15418 {
-      proto=0; x=44.9mm; y=13.9mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-      ha:flags {
-       clearline=1
-      }
-
-      li:thermal {
-        li:2 {
-         on  
-         solid  
-         noshape  
-        }
-        li:3 {
-         on  
-         solid  
-         noshape  
-        }
-      }
-     }
      ha:padstack_ref.17425 {
       proto=0; x=24.5mm; y=10.3mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
       ha:flags {
@@ -333,15 +257,6 @@ ha:pcb-rnd-board-v8 {
       li:thermal {
       }
      }
-     ha:padstack_ref.21570 {
-      proto=0; x=24.6mm; y=18.8mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-      ha:flags {
-       clearline=1
-      }
-
-      li:thermal {
-      }
-     }
      ha:padstack_ref.22159 {
       proto=0; x=24.5mm; y=25.7mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
       ha:flags {
@@ -360,33 +275,6 @@ ha:pcb-rnd-board-v8 {
       li:thermal {
       }
      }
-     ha:padstack_ref.22161 {
-      proto=0; x=31.3mm; y=21.3mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-      ha:flags {
-       clearline=1
-      }
-
-      li:thermal {
-      }
-     }
-     ha:padstack_ref.22672 {
-      proto=0; x=29.0mm; y=22.3mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-      ha:flags {
-       clearline=1
-      }
-
-      li:thermal {
-      }
-     }
-     ha:padstack_ref.22673 {
-      proto=0; x=30.0mm; y=25.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
-      ha:flags {
-       clearline=1
-      }
-
-      li:thermal {
-      }
-     }
      ha:padstack_ref.23370 {
       proto=0; x=25.1mm; y=14.7mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
       ha:flags {
@@ -442,8 +330,84 @@ ha:pcb-rnd-board-v8 {
       li:thermal {
       }
      }
-     ha:padstack_ref.25068 {
-      proto=0; x=46.5mm; y=27.8mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+     ha:padstack_ref.26021 {
+      proto=0; x=49.6mm; y=15.9mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+      ha:flags {
+       clearline=1
+      }
+
+      li:thermal {
+        li:2 {
+         on  
+         solid  
+         noshape  
+        }
+        li:3 {
+         on  
+         solid  
+         noshape  
+        }
+      }
+     }
+     ha:padstack_ref.26022 {
+      proto=0; x=49.6mm; y=23.1mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+      ha:flags {
+       clearline=1
+      }
+
+      li:thermal {
+        li:2 {
+         on  
+         solid  
+         noshape  
+        }
+        li:3 {
+         on  
+         solid  
+         noshape  
+        }
+      }
+     }
+     ha:padstack_ref.26023 {
+      proto=0; x=42.3mm; y=23.1mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+      ha:flags {
+       clearline=1
+      }
+
+      li:thermal {
+        li:2 {
+         on  
+         solid  
+         noshape  
+        }
+        li:3 {
+         on  
+         solid  
+         noshape  
+        }
+      }
+     }
+     ha:padstack_ref.26024 {
+      proto=0; x=42.3mm; y=15.9mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+      ha:flags {
+       clearline=1
+      }
+
+      li:thermal {
+        li:2 {
+         on  
+         solid  
+         noshape  
+        }
+        li:3 {
+         on  
+         solid  
+         noshape  
+        }
+      }
+     }
+     ha:padstack_ref.26026 {
+      proto=0; x=48.8mm; y=12.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
       ha:flags {
        clearline=1
       }
@@ -451,8 +415,8 @@ ha:pcb-rnd-board-v8 {
       li:thermal {
       }
      }
-     ha:padstack_ref.25069 {
-      proto=0; x=49.9mm; y=27.8mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+     ha:padstack_ref.26027 {
+      proto=0; x=25.0mm; y=18.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
       ha:flags {
        clearline=1
       }
@@ -460,8 +424,8 @@ ha:pcb-rnd-board-v8 {
       li:thermal {
       }
      }
-     ha:padstack_ref.25477 {
-      proto=0; x=45.2mm; y=30.9mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+     ha:padstack_ref.26145 {
+      proto=0; x=23.6mm; y=18.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
       ha:flags {
        clearline=1
       }
@@ -469,8 +433,8 @@ ha:pcb-rnd-board-v8 {
       li:thermal {
       }
      }
-     ha:padstack_ref.25478 {
-      proto=0; x=1000.0mil; y=31.1mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+     ha:padstack_ref.26524 {
+      proto=0; x=19.2mm; y=20.5mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
       ha:flags {
        clearline=1
       }
@@ -478,8 +442,8 @@ ha:pcb-rnd-board-v8 {
       li:thermal {
       }
      }
-     ha:padstack_ref.25609 {
-      proto=0; x=51.2mm; y=25.1mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+     ha:padstack_ref.26624 {
+      proto=0; x=25.0mm; y=28.8mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
       ha:flags {
        clearline=1
       }
@@ -487,8 +451,8 @@ ha:pcb-rnd-board-v8 {
       li:thermal {
       }
      }
-     ha:padstack_ref.25610 {
-      proto=0; x=51.2mm; y=10.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+     ha:padstack_ref.26625 {
+      proto=0; x=20.3mm; y=29.4mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
       ha:flags {
        clearline=1
       }
@@ -496,8 +460,53 @@ ha:pcb-rnd-board-v8 {
       li:thermal {
       }
      }
-     ha:padstack_ref.25043 {
-      proto=0; x=21.5mm; y=18.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+     ha:padstack_ref.26833 {
+      proto=0; x=24.1mm; y=26.5mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+      ha:flags {
+       clearline=1
+      }
+
+      li:thermal {
+      }
+     }
+     ha:padstack_ref.26979 {
+      proto=0; x=19.9mm; y=8.1mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+      ha:flags {
+       clearline=1
+      }
+
+      li:thermal {
+      }
+     }
+     ha:padstack_ref.26989 {
+      proto=0; x=19.2mm; y=17.3mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+      ha:flags {
+       clearline=1
+      }
+
+      li:thermal {
+      }
+     }
+     ha:padstack_ref.27182 {
+      proto=0; x=28.8mm; y=22.2mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+      ha:flags {
+       clearline=1
+      }
+
+      li:thermal {
+      }
+     }
+     ha:padstack_ref.27219 {
+      proto=0; x=29.6mm; y=12.2mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+      ha:flags {
+       clearline=1
+      }
+
+      li:thermal {
+      }
+     }
+     ha:padstack_ref.27233 {
+      proto=0; x=25.1mm; y=9.7mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
       ha:flags {
        clearline=1
       }
@@ -580,7 +589,7 @@ ha:pcb-rnd-board-v8 {
 
       li:objects {
        ha:padstack_ref.82 {
-        proto=0; x=19.5mm; y=20.2mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
+        proto=0; x=1000.0mil; y=27.9mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
         ha:flags {
          clearline=1
         }
@@ -594,7 +603,7 @@ ha:pcb-rnd-board-v8 {
         }
        }
        ha:padstack_ref.83 {
-        proto=0; x=19.5mm; y=18.8mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
+        proto=0; x=1000.0mil; y=26.5mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
         ha:flags {
          clearline=1
         }
@@ -616,25 +625,25 @@ ha:pcb-rnd-board-v8 {
 
          li:objects {
           ha:line.43 {
-           x1=19.5mm; y1=19.5mm; x2=19.5mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+           x1=1000.0mil; y1=27.2mm; x2=1000.0mil; y2=27.2mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=origin
            }
           }
           ha:line.46 {
-           x1=19.5mm; y1=19.5mm; x2=18.5mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+           x1=1000.0mil; y1=27.2mm; x2=24.4mm; y2=27.2mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=x
            }
           }
           ha:line.49 {
-           x1=19.5mm; y1=19.5mm; x2=19.5mm; y2=18.5mm; thickness=0.1mm; clearance=0.0;
+           x1=1000.0mil; y1=27.2mm; x2=1000.0mil; y2=26.2mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=y
            }
           }
           ha:line.52 {
-           x1=19.5mm; y1=19.5mm; x2=19.5mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+           x1=1000.0mil; y1=27.2mm; x2=1000.0mil; y2=27.2mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=pnp-origin
            }
@@ -653,10 +662,10 @@ ha:pcb-rnd-board-v8 {
 
          li:objects {
           ha:line.55 {
-           x1=20.35mm; y1=20.4mm; x2=20.35mm; y2=18.6mm; thickness=0.2mm; clearance=0.0;
+           x1=26.25mm; y1=28.1mm; x2=26.25mm; y2=26.3mm; thickness=0.2mm; clearance=0.0;
           }
           ha:line.58 {
-           x1=734.2519685mil; y1=20.4mm; x2=734.2519685mil; y2=18.6mm; thickness=0.2mm; clearance=0.0;
+           x1=24.55mm; y1=28.1mm; x2=24.55mm; y2=26.3mm; thickness=0.2mm; clearance=0.0;
           }
          }
          ha:type {
@@ -671,28 +680,28 @@ ha:pcb-rnd-board-v8 {
 
          li:objects {
           ha:line.62 {
-           x1=20.2mm; y1=19.5mm; x2=18.8mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+           x1=26.1mm; y1=27.2mm; x2=24.7mm; y2=27.2mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.65 {
-           x1=19.5mm; y1=20.2mm; x2=19.5mm; y2=18.8mm; thickness=0.1mm; clearance=0.0;
+           x1=1000.0mil; y1=27.9mm; x2=1000.0mil; y2=26.5mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.68 {
-           x1=19.9mm; y1=20.3mm; x2=19.1mm; y2=20.3mm; thickness=0.1mm; clearance=0.0;
+           x1=25.8mm; y1=28.0mm; x2=25.0mm; y2=28.0mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.71 {
-           x1=19.1mm; y1=20.3mm; x2=19.1mm; y2=18.7mm; thickness=0.1mm; clearance=0.0;
+           x1=25.0mm; y1=28.0mm; x2=25.0mm; y2=26.4mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.74 {
-           x1=19.1mm; y1=18.7mm; x2=19.9mm; y2=18.7mm; thickness=0.1mm; clearance=0.0;
+           x1=25.0mm; y1=26.4mm; x2=25.8mm; y2=26.4mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.77 {
-           x1=19.9mm; y1=18.7mm; x2=19.9mm; y2=20.3mm; thickness=0.1mm; clearance=0.0;
+           x1=25.8mm; y1=26.4mm; x2=25.8mm; y2=28.0mm; thickness=0.1mm; clearance=0.0;
           }
           ha:arc.80 {
-           x=19.5mm; y=19.5mm; width=0.5mm; height=0.5mm; astart=180.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
+           x=1000.0mil; y=27.2mm; width=0.5mm; height=0.5mm; astart=180.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
           }
           ha:text.61 {
-           string=%a.parent.refdes%; x=19.5mm; y=19.5mm; scale=100; fid=0;
+           string=%a.parent.refdes%; x=1000.0mil; y=27.2mm; scale=100; fid=0;
            ha:flags {
             dyntext=1
             floater=1
@@ -715,14 +724,14 @@ ha:pcb-rnd-board-v8 {
           ha:polygon.84 {
            li:geometry {
              ta:contour {
-              { 20.23mm; 20.755mm }
-              { 20.23mm; 20.48mm }
-              { 20.23mm; 18.52mm }
-              { 20.23mm; 18.245mm }
-              { 18.77mm; 18.245mm }
-              { 18.77mm; 18.52mm }
-              { 18.77mm; 20.48mm }
-              { 18.77mm; 20.755mm }
+              { 26.13mm; 28.455mm }
+              { 26.13mm; 28.18mm }
+              { 26.13mm; 26.22mm }
+              { 26.13mm; 25.945mm }
+              { 24.67mm; 25.945mm }
+              { 24.67mm; 26.22mm }
+              { 24.67mm; 28.18mm }
+              { 24.67mm; 28.455mm }
              }
            }
           }
@@ -812,7 +821,7 @@ ha:pcb-rnd-board-v8 {
 
       li:objects {
        ha:padstack_ref.211 {
-        proto=0; x=23.5mm; y=18.8mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+        proto=0; x=25.3mm; y=19.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
         ha:flags {
          clearline=1
         }
@@ -826,7 +835,7 @@ ha:pcb-rnd-board-v8 {
         }
        }
        ha:padstack_ref.212 {
-        proto=0; x=23.5mm; y=20.2mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+        proto=0; x=25.3mm; y=20.4mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
         ha:flags {
          clearline=1
         }
@@ -848,25 +857,25 @@ ha:pcb-rnd-board-v8 {
 
          li:objects {
           ha:line.172 {
-           x1=23.5mm; y1=19.5mm; x2=23.5mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+           x1=25.3mm; y1=19.7mm; x2=25.3mm; y2=19.7mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=origin
            }
           }
           ha:line.175 {
-           x1=23.5mm; y1=19.5mm; x2=24.5mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+           x1=25.3mm; y1=19.7mm; x2=26.3mm; y2=19.7mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=x
            }
           }
           ha:line.178 {
-           x1=23.5mm; y1=19.5mm; x2=23.5mm; y2=20.5mm; thickness=0.1mm; clearance=0.0;
+           x1=25.3mm; y1=19.7mm; x2=25.3mm; y2=20.7mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=y
            }
           }
           ha:line.181 {
-           x1=23.5mm; y1=19.5mm; x2=23.5mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+           x1=25.3mm; y1=19.7mm; x2=25.3mm; y2=19.7mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=pnp-origin
            }
@@ -885,10 +894,10 @@ ha:pcb-rnd-board-v8 {
 
          li:objects {
           ha:line.184 {
-           x1=22.65mm; y1=18.6mm; x2=22.65mm; y2=20.4mm; thickness=0.2mm; clearance=0.0;
+           x1=24.45mm; y1=18.8mm; x2=24.45mm; y2=20.6mm; thickness=0.2mm; clearance=0.0;
           }
           ha:line.187 {
-           x1=24.35mm; y1=18.6mm; x2=24.35mm; y2=20.4mm; thickness=0.2mm; clearance=0.0;
+           x1=26.15mm; y1=18.8mm; x2=26.15mm; y2=20.6mm; thickness=0.2mm; clearance=0.0;
           }
          }
          ha:type {
@@ -903,28 +912,28 @@ ha:pcb-rnd-board-v8 {
 
          li:objects {
           ha:line.191 {
-           x1=22.8mm; y1=19.5mm; x2=24.2mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+           x1=24.6mm; y1=19.7mm; x2=26.0mm; y2=19.7mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.194 {
-           x1=23.5mm; y1=18.8mm; x2=23.5mm; y2=20.2mm; thickness=0.1mm; clearance=0.0;
+           x1=25.3mm; y1=19.0mm; x2=25.3mm; y2=20.4mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.197 {
-           x1=23.1mm; y1=18.7mm; x2=23.9mm; y2=18.7mm; thickness=0.1mm; clearance=0.0;
+           x1=24.9mm; y1=18.9mm; x2=25.7mm; y2=18.9mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.200 {
-           x1=23.9mm; y1=18.7mm; x2=23.9mm; y2=20.3mm; thickness=0.1mm; clearance=0.0;
+           x1=25.7mm; y1=18.9mm; x2=25.7mm; y2=20.5mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.203 {
-           x1=23.9mm; y1=20.3mm; x2=23.1mm; y2=20.3mm; thickness=0.1mm; clearance=0.0;
+           x1=25.7mm; y1=20.5mm; x2=24.9mm; y2=20.5mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.206 {
-           x1=23.1mm; y1=20.3mm; x2=23.1mm; y2=18.7mm; thickness=0.1mm; clearance=0.0;
+           x1=24.9mm; y1=20.5mm; x2=24.9mm; y2=18.9mm; thickness=0.1mm; clearance=0.0;
           }
           ha:arc.209 {
-           x=23.5mm; y=19.5mm; width=0.5mm; height=0.5mm; astart=0.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
+           x=25.3mm; y=19.7mm; width=0.5mm; height=0.5mm; astart=0.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
           }
           ha:text.190 {
-           string=%a.parent.refdes%; x=23.5mm; y=19.5mm; scale=100; fid=0;
+           string=%a.parent.refdes%; x=25.3mm; y=19.7mm; scale=100; fid=0;
            ha:flags {
             dyntext=1
             floater=1
@@ -947,14 +956,14 @@ ha:pcb-rnd-board-v8 {
           ha:polygon.213 {
            li:geometry {
              ta:contour {
-              { 22.77mm; 18.245mm }
-              { 22.77mm; 18.52mm }
-              { 22.77mm; 20.48mm }
-              { 22.77mm; 20.755mm }
-              { 24.23mm; 20.755mm }
-              { 24.23mm; 20.48mm }
-              { 24.23mm; 18.52mm }
-              { 24.23mm; 18.245mm }
+              { 24.57mm; 18.445mm }
+              { 24.57mm; 18.72mm }
+              { 24.57mm; 20.68mm }
+              { 24.57mm; 825.0mil }
+              { 26.03mm; 825.0mil }
+              { 26.03mm; 20.68mm }
+              { 26.03mm; 18.72mm }
+              { 26.03mm; 18.445mm }
              }
            }
           }
@@ -1044,7 +1053,7 @@ ha:pcb-rnd-board-v8 {
 
       li:objects {
        ha:padstack_ref.370 {
-        proto=0; x=21.5mm; y=18.8mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+        proto=0; x=23.6mm; y=19.0mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
         ha:flags {
          clearline=1
         }
@@ -1058,7 +1067,7 @@ ha:pcb-rnd-board-v8 {
         }
        }
        ha:padstack_ref.371 {
-        proto=0; x=21.5mm; y=20.2mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
+        proto=0; x=23.6mm; y=20.4mm; rot=0.000000; xmirror=0; smirror=0; clearance=0.2mm;
         ha:flags {
          clearline=1
         }
@@ -1080,25 +1089,25 @@ ha:pcb-rnd-board-v8 {
 
          li:objects {
           ha:line.331 {
-           x1=21.5mm; y1=19.5mm; x2=21.5mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+           x1=23.6mm; y1=19.7mm; x2=23.6mm; y2=19.7mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=origin
            }
           }
           ha:line.334 {
-           x1=21.5mm; y1=19.5mm; x2=22.5mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+           x1=23.6mm; y1=19.7mm; x2=24.6mm; y2=19.7mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=x
            }
           }
           ha:line.337 {
-           x1=21.5mm; y1=19.5mm; x2=21.5mm; y2=20.5mm; thickness=0.1mm; clearance=0.0;
+           x1=23.6mm; y1=19.7mm; x2=23.6mm; y2=20.7mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=y
            }
           }
           ha:line.340 {
-           x1=21.5mm; y1=19.5mm; x2=21.5mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+           x1=23.6mm; y1=19.7mm; x2=23.6mm; y2=19.7mm; thickness=0.1mm; clearance=0.0;
            ha:attributes {
              subc-role=pnp-origin
            }
@@ -1117,10 +1126,10 @@ ha:pcb-rnd-board-v8 {
 
          li:objects {
           ha:line.343 {
-           x1=20.65mm; y1=18.6mm; x2=20.65mm; y2=20.4mm; thickness=0.2mm; clearance=0.0;
+           x1=22.75mm; y1=18.8mm; x2=22.75mm; y2=20.6mm; thickness=0.2mm; clearance=0.0;
           }
           ha:line.346 {
-           x1=22.35mm; y1=18.6mm; x2=22.35mm; y2=20.4mm; thickness=0.2mm; clearance=0.0;
+           x1=24.45mm; y1=18.8mm; x2=24.45mm; y2=20.6mm; thickness=0.2mm; clearance=0.0;
           }
          }
          ha:type {
@@ -1135,28 +1144,28 @@ ha:pcb-rnd-board-v8 {
 
          li:objects {
           ha:line.350 {
-           x1=20.8mm; y1=19.5mm; x2=22.2mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+           x1=22.9mm; y1=19.7mm; x2=24.3mm; y2=19.7mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.353 {
-           x1=21.5mm; y1=18.8mm; x2=21.5mm; y2=20.2mm; thickness=0.1mm; clearance=0.0;
+           x1=23.6mm; y1=19.0mm; x2=23.6mm; y2=20.4mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.356 {
-           x1=21.1mm; y1=18.7mm; x2=862.20472441mil; y2=18.7mm; thickness=0.1mm; clearance=0.0;
+           x1=23.2mm; y1=18.9mm; x2=24.0mm; y2=18.9mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.359 {
-           x1=862.20472441mil; y1=18.7mm; x2=862.20472441mil; y2=20.3mm; thickness=0.1mm; clearance=0.0;
+           x1=24.0mm; y1=18.9mm; x2=24.0mm; y2=20.5mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.362 {
-           x1=862.20472441mil; y1=20.3mm; x2=21.1mm; y2=20.3mm; thickness=0.1mm; clearance=0.0;
+           x1=24.0mm; y1=20.5mm; x2=23.2mm; y2=20.5mm; thickness=0.1mm; clearance=0.0;
           }
           ha:line.365 {
-           x1=21.1mm; y1=20.3mm; x2=21.1mm; y2=18.7mm; thickness=0.1mm; clearance=0.0;
+           x1=23.2mm; y1=20.5mm; x2=23.2mm; y2=18.9mm; thickness=0.1mm; clearance=0.0;
           }
           ha:arc.368 {
-           x=21.5mm; y=19.5mm; width=0.5mm; height=0.5mm; astart=0.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
+           x=23.6mm; y=19.7mm; width=0.5mm; height=0.5mm; astart=0.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
           }
           ha:text.349 {
-           string=%a.parent.refdes%; x=21.5mm; y=19.5mm; scale=100; fid=0;
+           string=%a.parent.refdes%; x=23.6mm; y=19.7mm; scale=100; fid=0;
            ha:flags {
             dyntext=1
             floater=1
@@ -1179,14 +1188,14 @@ ha:pcb-rnd-board-v8 {
           ha:polygon.372 {
            li:geometry {
              ta:contour {
-              { 20.77mm; 18.245mm }
-              { 20.77mm; 18.52mm }
-              { 20.77mm; 20.48mm }
-              { 20.77mm; 20.755mm }
-              { 22.23mm; 20.755mm }
-              { 22.23mm; 20.48mm }
-              { 22.23mm; 18.52mm }
-              { 22.23mm; 18.245mm }
+              { 22.87mm; 18.445mm }
+              { 22.87mm; 18.72mm }
+              { 22.87mm; 20.68mm }
+              { 22.87mm; 825.0mil }
+              { 24.33mm; 825.0mil }
+              { 24.33mm; 20.68mm }
+              { 24.33mm; 18.72mm }
+              { 24.33mm; 18.445mm }
              }
            }
           }
@@ -1276,9 +1285,10 @@ ha:pcb-rnd-board-v8 {
 
         li:objects {
          ha:padstack_ref.8311 {
-          proto=0; x=50.75mm; y=28.45mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+          proto=0; x=21.75mm; y=20.45mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
           ha:flags {
            clearline=1
+           lock=1
           }
 
           li:thermal {
@@ -1290,9 +1300,10 @@ ha:pcb-rnd-board-v8 {
           }
          }
          ha:padstack_ref.8312 {
-          proto=0; x=48.85mm; y=28.45mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+          proto=0; x=21.75mm; y=18.55mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
           ha:flags {
            clearline=1
+           lock=1
           }
 
           li:thermal {
@@ -1304,9 +1315,10 @@ ha:pcb-rnd-board-v8 {
           }
          }
          ha:padstack_ref.8313 {
-          proto=0; x=49.8mm; y=30.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+          proto=0; x=19.45mm; y=19.5mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
           ha:flags {
            clearline=1
+           lock=1
           }
 
           li:thermal {
@@ -1326,29 +1338,33 @@ ha:pcb-rnd-board-v8 {
 
            li:objects {
             ha:line.8255 {
-             x1=49.8mm; y1=29.6mm; x2=49.8mm; y2=29.6mm; thickness=0.1mm; clearance=0.0;
+             x1=20.6mm; y1=19.5mm; x2=20.6mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
              ha:attributes {
                subc-role=origin
              }
-            }
+ ha:flags ={ lock=1
+ };            }
             ha:line.8258 {
-             x1=49.8mm; y1=29.6mm; x2=49.8mm; y2=30.6mm; thickness=0.1mm; clearance=0.0;
+             x1=20.6mm; y1=19.5mm; x2=19.6mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
              ha:attributes {
                subc-role=x
              }
-            }
+ ha:flags ={ lock=1
+ };            }
             ha:line.8261 {
-             x1=49.8mm; y1=29.6mm; x2=48.8mm; y2=29.6mm; thickness=0.1mm; clearance=0.0;
+             x1=20.6mm; y1=19.5mm; x2=20.6mm; y2=18.5mm; thickness=0.1mm; clearance=0.0;
              ha:attributes {
                subc-role=y
              }
-            }
+ ha:flags ={ lock=1
+ };            }
             ha:line.8264 {
-             x1=49.8mm; y1=29.6mm; x2=49.8mm; y2=29.6mm; thickness=0.1mm; clearance=0.0;
+             x1=20.6mm; y1=19.5mm; x2=20.6mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
              ha:attributes {
                subc-role=pnp-origin
              }
-            }
+ ha:flags ={ lock=1
+ };            }
            }
            ha:type {
             top = 1
@@ -1363,26 +1379,33 @@ ha:pcb-rnd-board-v8 {
 
            li:objects {
             ha:line.8267 {
-             x1=51.36mm; y1=28.85mm; x2=51.36mm; y2=30.35mm; thickness=0.2mm; clearance=0.0;
-            }
+             x1=21.35mm; y1=21.06mm; x2=19.85mm; y2=21.06mm; thickness=0.2mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:line.8270 {
-             x1=51.36mm; y1=30.35mm; x2=50.4mm; y2=30.35mm; thickness=0.2mm; clearance=0.0;
-            }
+             x1=19.85mm; y1=21.06mm; x2=19.85mm; y2=20.1mm; thickness=0.2mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:line.8273 {
-             x1=49.2mm; y1=30.35mm; x2=48.24mm; y2=30.35mm; thickness=0.2mm; clearance=0.0;
-            }
+             x1=19.85mm; y1=18.9mm; x2=19.85mm; y2=17.94mm; thickness=0.2mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:line.8276 {
-             x1=48.24mm; y1=30.35mm; x2=48.24mm; y2=28.85mm; thickness=0.2mm; clearance=0.0;
-            }
+             x1=19.85mm; y1=17.94mm; x2=21.35mm; y2=17.94mm; thickness=0.2mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:line.8279 {
-             x1=50.15mm; y1=28.85mm; x2=49.45mm; y2=28.85mm; thickness=0.2mm; clearance=0.0;
-            }
+             x1=21.35mm; y1=19.85mm; x2=21.35mm; y2=19.15mm; thickness=0.2mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:line.8282 {
-             x1=51.35mm; y1=28.85mm; x2=51.35mm; y2=27.6mm; thickness=0.2mm; clearance=0.0;
-            }
+             x1=21.35mm; y1=21.05mm; x2=22.6mm; y2=21.05mm; thickness=0.2mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:line.8285 {
-             x1=51.35mm; y1=27.6mm; x2=50.45mm; y2=27.6mm; thickness=0.2mm; clearance=0.0;
-            }
+             x1=22.6mm; y1=21.05mm; x2=22.6mm; y2=20.15mm; thickness=0.2mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
            }
            ha:type {
             silk = 1
@@ -1396,36 +1419,45 @@ ha:pcb-rnd-board-v8 {
 
            li:objects {
             ha:line.8288 {
-             x1=49.8mm; y1=28.9mm; x2=49.8mm; y2=30.3mm; thickness=0.1mm; clearance=0.0;
-            }
+             x1=21.3mm; y1=19.5mm; x2=19.9mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:line.8291 {
-             x1=50.5mm; y1=29.6mm; x2=49.1mm; y2=29.6mm; thickness=0.1mm; clearance=0.0;
-            }
+             x1=20.6mm; y1=20.2mm; x2=20.6mm; y2=18.8mm; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:line.8294 {
-             x1=51.26mm; y1=29.6mm; x2=51.26mm; y2=30.25mm; thickness=0.1mm; clearance=0.0;
-            }
+             x1=20.6mm; y1=20.96mm; x2=19.95mm; y2=20.96mm; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:line.8297 {
-             x1=51.26mm; y1=30.25mm; x2=48.34mm; y2=30.25mm; thickness=0.1mm; clearance=0.0;
-            }
+             x1=19.95mm; y1=20.96mm; x2=19.95mm; y2=18.04mm; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:line.8300 {
-             x1=48.34mm; y1=30.25mm; x2=48.34mm; y2=28.95mm; thickness=0.1mm; clearance=0.0;
-            }
+             x1=19.95mm; y1=18.04mm; x2=21.25mm; y2=18.04mm; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:line.8303 {
-             x1=48.34mm; y1=28.95mm; x2=50.61mm; y2=28.95mm; thickness=0.1mm; clearance=0.0;
-            }
+             x1=21.25mm; y1=18.04mm; x2=21.25mm; y2=20.31mm; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:line.8306 {
-             x1=50.61mm; y1=28.95mm; x2=51.26mm; y2=29.6mm; thickness=0.1mm; clearance=0.0;
-            }
+             x1=21.25mm; y1=20.31mm; x2=20.6mm; y2=20.96mm; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:arc.8309 {
-             x=49.8mm; y=29.6mm; width=0.5mm; height=0.5mm; astart=270.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
-            }
+             x=20.6mm; y=19.5mm; width=0.5mm; height=0.5mm; astart=180.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };            }
             ha:text.8310 {
-             string=%a.parent.refdes%; x=49.8mm; y=29.6mm; scale=100; fid=0;
+             string=%a.parent.refdes%; x=20.6mm; y=19.5mm; scale=100; fid=0;
              ha:flags {
               dyntext=1
               floater=1
+              lock=1
              }
-             rot = 270.000000
+             rot = 180.000000
             }
            }
            ha:type {
@@ -1443,21 +1475,22 @@ ha:pcb-rnd-board-v8 {
             ha:polygon.8314 {
              li:geometry {
                ta:contour {
-                { 51.3mm; 27.65mm }
-                { 51.3mm; 28.7mm }
-                { 51.51mm; 28.7mm }
-                { 51.51mm; 30.5mm }
-                { 50.35mm; 30.5mm }
-                { 50.35mm; 31.55mm }
-                { 49.25mm; 31.55mm }
-                { 49.25mm; 30.5mm }
-                { 48.09mm; 30.5mm }
-                { 48.09mm; 28.7mm }
-                { 1.9015748in; 28.7mm }
-                { 1.9015748in; 27.65mm }
+                { 22.55mm; 21.0mm }
+                { 21.5mm; 21.0mm }
+                { 21.5mm; 21.21mm }
+                { 19.7mm; 21.21mm }
+                { 19.7mm; 20.05mm }
+                { 734.2519685mil; 20.05mm }
+                { 734.2519685mil; 18.95mm }
+                { 19.7mm; 18.95mm }
+                { 19.7mm; 17.79mm }
+                { 21.5mm; 17.79mm }
+                { 21.5mm; 18.0mm }
+                { 22.55mm; 18.0mm }
                }
              }
-            }
+ ha:flags ={ lock=1
+ };            }
            }
            ha:type {
             top = 1
@@ -1468,7 +1501,8 @@ ha:pcb-rnd-board-v8 {
         }
        }
         uid = fNBhogi9RvPCwmAkAQYAAAAD
-       }
+ ha:flags ={ lock=1
+ };       }
         ha:subc.10478 {
          ha:attributes {
           value=1k
@@ -5623,1607 +5657,2373 @@ ha:pcb-rnd-board-v8 {
          uid = fNBhogi9RvPCwmAkAQYAAAAn
  ha:flags ={ lock=1
  };        }
-        ha:subc.12480 {
-         ha:attributes {
-          value=CR1220
-          footprint=CONNECTOR_MY-1220-03.lht
-          refdes=B1
-         }
-        ha:data {
-                li:padstack_prototypes {
-
-         ha:ps_proto_v6.0 {
-           hdia=0.0; hplated=0; htop=0; hbottom=0;
-           li:shape {
-
-             ha:ps_shape_v4 {
-              ha:combining {              }
-              ha:layer_mask {
-               copper = 1
-               top = 1
-              }
-              clearance=0.2mm
-               li:ps_poly {
-                -1.95mm  
-                -2.1mm  
-                1.95mm  
-                -2.1mm  
-                1.95mm  
-                2.1mm  
-                -1.95mm  
-                2.1mm  
-               }
-             }
-
-             ha:ps_shape_v4 {
-              ha:combining { sub=1; auto=1;              }
-              ha:layer_mask {
-               top = 1
-               mask = 1
-              }
-              clearance=0.0
-               li:ps_poly {
-                -2.0mm  
-                -2.15mm  
-                2.0mm  
-                -2.15mm  
-                2.0mm  
-                2.15mm  
-                -2.0mm  
-                2.15mm  
-               }
-             }
-
-             ha:ps_shape_v4 {
-              ha:combining { auto=1;              }
-              ha:layer_mask {
-               top = 1
-               paste = 1
-              }
-              clearance=0.0
-               li:ps_poly {
-                -1.95mm  
-                -2.1mm  
-                1.95mm  
-                -2.1mm  
-                1.95mm  
-                2.1mm  
-                -1.95mm  
-                2.1mm  
-               }
-             }
-           }
-         }
-
-         ha:ps_proto_v6.1 {
-           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=9.0mm;              }
-              ha:combining {              }
-              ha:layer_mask {
-               copper = 1
-               top = 1
-              }
-              clearance=0.2mm
-             }
-
-             ha:ps_shape_v4 {
-              ha:ps_circ { x=0.0; y=0.0; dia=9.05mm;              }
-              ha:combining { sub=1; auto=1;              }
-              ha:layer_mask {
-               top = 1
-               mask = 1
-              }
-              clearance=0.0
-             }
-
-             ha:ps_shape_v4 {
-              ha:ps_circ { x=0.0; y=0.0; dia=9.0mm;              }
-              ha:combining { auto=1;              }
-              ha:layer_mask {
-               top = 1
-               paste = 1
-              }
-              clearance=0.0
-             }
-           }
-         }
-        }
-
-         li:objects {
-          ha:padstack_ref.12541 {
-           proto=0; x=48.5mm; y=9.95mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
+          ha:subc.25195 {
            ha:attributes {
-             term=1
-             name=1
-           }
-          }
-          ha:padstack_ref.12542 {
-           proto=0; x=48.5mm; y=25.05mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
+            value=USB-C receptacle
+            footprint=CONNECTOR_XKB_U262-24XN-4BV60.lht
+            refdes=J1
            }
+          ha:data {
+                    li:padstack_prototypes {
 
-           li:thermal {
-           }
+           ha:ps_proto_v6.0 {
+             hdia=0.0; hplated=0; htop=0; hbottom=0;
+             li:shape {
 
-           ha:attributes {
-             term=2
-             name=2
-           }
-          }
-          ha:padstack_ref.12543 {
-           proto=1; x=48.5mm; y=17.5mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-             li:2 {
-              on  
-              diag  
-              round  
-              noshape  
-             }
-           }
-
-           ha:attributes {
-             term=3
-             name=3
-           }
-          }
-         }
-         li:layers {
-
-          ha:subc-aux {
-           lid=0
-           ha:combining {           }
-
-            li:objects {
-             ha:line.12481 {
-              x1=48.5mm; y1=17.5mm; x2=48.5mm; y2=17.5mm; thickness=0.1mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-
-              ha:attributes {
-                subc-role=origin
-              }
-             }
-             ha:line.12484 {
-              x1=48.5mm; y1=17.5mm; x2=48.5mm; y2=18.5mm; thickness=0.1mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-
-              ha:attributes {
-                subc-role=x
-              }
-             }
-             ha:line.12487 {
-              x1=48.5mm; y1=17.5mm; x2=47.5mm; y2=17.5mm; thickness=0.1mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-
-              ha:attributes {
-                subc-role=y
-              }
-             }
-             ha:line.12490 {
-              x1=47.6mm; y1=17.5mm; x2=47.6mm; y2=17.5mm; thickness=0.1mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-
-              ha:attributes {
-                subc-role=pnp-origin
-              }
-             }
-            }
-            ha:type {
-             top = 1
-             misc = 1
-             virtual = 1
-            }
-          }
-
-          ha:top-silkscreen {
-           lid=1
-           ha:combining {           }
-
-            li:objects {
-             ha:line.12493 {
-              x1=44.6mm; y1=10.9mm; x2=41.6mm; y2=13.9mm; thickness=0.2mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:line.12496 {
-              x1=41.6mm; y1=13.9mm; x2=41.6mm; y2=21.1mm; thickness=0.2mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:line.12499 {
-              x1=41.6mm; y1=21.1mm; x2=44.6mm; y2=24.1mm; thickness=0.2mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:line.12502 {
-              x1=53.7mm; y1=10.8mm; x2=53.7mm; y2=24.2mm; thickness=0.2mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:line.12505 {
-              x1=53.7mm; y1=24.2mm; x2=2.00393701in; y2=24.2mm; thickness=0.2mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:line.12508 {
-              x1=46.1mm; y1=24.2mm; x2=41.5mm; y2=24.2mm; thickness=0.2mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:line.12511 {
-              x1=41.5mm; y1=24.2mm; x2=41.5mm; y2=10.8mm; thickness=0.2mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:line.12514 {
-              x1=53.7mm; y1=10.8mm; x2=2.00393701in; y2=10.8mm; thickness=0.2mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:line.12517 {
-              x1=46.1mm; y1=10.8mm; x2=41.5mm; y2=10.8mm; thickness=0.2mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-            }
-            ha:type {
-             silk = 1
-             top = 1
-            }
-          }
-
-          ha:top-assembly {
-           lid=2
-           ha:combining {           }
-
-            li:objects {
-             ha:line.12521 {
-              x1=47.6mm; y1=16.8mm; x2=47.6mm; y2=18.2mm; thickness=0.1mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:line.12524 {
-              x1=1.9015748in; y1=17.5mm; x2=46.9mm; y2=17.5mm; thickness=0.1mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:line.12527 {
-              x1=53.6mm; y1=10.9mm; x2=53.6mm; y2=24.1mm; thickness=0.1mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:line.12530 {
-              x1=53.6mm; y1=24.1mm; x2=41.6mm; y2=24.1mm; thickness=0.1mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:line.12533 {
-              x1=41.6mm; y1=24.1mm; x2=41.6mm; y2=10.9mm; thickness=0.1mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:line.12536 {
-              x1=41.6mm; y1=10.9mm; x2=53.6mm; y2=10.9mm; thickness=0.1mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:arc.12539 {
-              x=47.6mm; y=17.5mm; width=0.5mm; height=0.5mm; astart=270.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
-              ha:flags {
-               lock=1
-              }
-             }
-             ha:text.12520 {
-              string=%a.parent.refdes%; x=47.6mm; y=17.5mm; scale=100; fid=0;
-              ha:flags {
-               dyntext=1
-               floater=1
-               lock=1
-              }
-              rot = 270.000000
-             }
-            }
-            ha:type {
-             top = 1
-             doc = 1
-            }
-            purpose = assy
-          }
-
-          ha:top-courtyard {
-           lid=3
-           ha:combining {           }
-
-            li:objects {
-             ha:polygon.12544 {
-              li:geometry {
-                ta:contour {
-                 { 53.85mm; 7.75mm }
-                 { 53.85mm; 27.25mm }
-                 { 41.35mm; 27.25mm }
-                 { 41.35mm; 7.75mm }
+               ha:ps_shape_v4 {
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 top = 1
                 }
-              }
+                clearance=0.2mm
+                 li:ps_poly {
+                  -0.15mm  
+                  -0.45mm  
+                  0.15mm  
+                  -0.45mm  
+                  0.15mm  
+                  0.45mm  
+                  -0.15mm  
+                  0.45mm  
+                 }
+               }
 
-              ha:flags {
-               lock=1
-              }
+               ha:ps_shape_v4 {
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 mask = 1
+                }
+                clearance=0.0
+                 li:ps_poly {
+                  -0.2mm  
+                  -0.5mm  
+                  0.2mm  
+                  -0.5mm  
+                  0.2mm  
+                  0.5mm  
+                  -0.2mm  
+                  0.5mm  
+                 }
+               }
+
+               ha:ps_shape_v4 {
+                ha:combining { auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 paste = 1
+                }
+                clearance=0.0
+                 li:ps_poly {
+                  -0.15mm  
+                  -0.45mm  
+                  0.15mm  
+                  -0.45mm  
+                  0.15mm  
+                  0.45mm  
+                  -0.15mm  
+                  0.45mm  
+                 }
+               }
              }
-            }
-            ha:type {
-             top = 1
-             doc = 1
-            }
-            purpose = ko.courtyard
-          }
-         }
-        }
-         uid = AQV3WupyorPasUcZHO0AAAAZ
- ha:flags ={ lock=1
- };        }
-       ha:subc.8328 {
-        ha:attributes {
-         value=
-         footprint=SOT95P237X112-3N.lht
-         refdes=Q2
-        }
-       ha:data {
-              li:padstack_prototypes {
+           }
 
-        ha:ps_proto_v6.0 {
-          hdia=0.0; hplated=0; htop=0; hbottom=0;
-          li:shape {
+           ha:ps_proto_v6.1 {
+             hdia=0.4mm; hplated=1; htop=0; hbottom=0;
+             li:shape {
 
-            ha:ps_shape_v4 {
-             ha:combining {             }
-             ha:layer_mask {
-              copper = 1
-              top = 1
+               ha:ps_shape_v4 {
+                ha:ps_circ { x=0.0; y=0.0; dia=0.7mm;                }
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 top = 1
+                }
+                clearance=0.2mm
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_circ { x=0.0; y=0.0; dia=0.75mm;                }
+                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=0.7mm;                }
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 intern = 1
+                }
+                clearance=0.2mm
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_circ { x=0.0; y=0.0; dia=0.7mm;                }
+                ha:combining {                }
+                ha:layer_mask {
+                 bottom = 1
+                 copper = 1
+                }
+                clearance=0.2mm
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_circ { x=0.0; y=0.0; dia=0.75mm;                }
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 bottom = 1
+                 mask = 1
+                }
+                clearance=0.0
+               }
              }
-             clearance=0.2mm
-              li:ps_poly {
-               -0.55mm  
-               -0.3mm  
-               0.55mm  
-               -0.3mm  
-               0.55mm  
-               0.3mm  
-               -0.55mm  
-               0.3mm  
-              }
-            }
+           }
 
-            ha:ps_shape_v4 {
-             ha:combining { sub=1; auto=1;             }
-             ha:layer_mask {
-              top = 1
-              mask = 1
+           ha:ps_proto_v6.2 {
+             hdia=0.0; hplated=1; htop=0; hbottom=0;
+             li:shape {
+
+               ha:ps_shape_v4 {
+                ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.5mm; square=0;                }
+                ha:combining { auto=1;                }
+                ha:layer_mask {
+                 mech = 1
+                }
+                clearance=0.0
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.9mm; square=0;                }
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 top = 1
+                }
+                clearance=0.2mm
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=1.0mm; square=0;                }
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 mask = 1
+                }
+                clearance=0.0
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.9mm; square=0;                }
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 intern = 1
+                }
+                clearance=0.2mm
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.9mm; square=0;                }
+                ha:combining {                }
+                ha:layer_mask {
+                 bottom = 1
+                 copper = 1
+                }
+                clearance=0.2mm
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=1.0mm; square=0;                }
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 bottom = 1
+                 mask = 1
+                }
+                clearance=0.0
+               }
              }
-             clearance=0.0
-              li:ps_poly {
-               -0.6mm  
-               -0.35mm  
-               0.6mm  
-               -0.35mm  
-               0.6mm  
-               0.35mm  
-               -0.6mm  
-               0.35mm  
-              }
-            }
+           }
 
-            ha:ps_shape_v4 {
-             ha:combining { auto=1;             }
-             ha:layer_mask {
-              top = 1
-              paste = 1
+           ha:ps_proto_v6.3 {
+             hdia=0.65mm; hplated=0; htop=0; hbottom=0;
+             li:shape {
+
+               ha:ps_shape_v4 {
+                ha:ps_circ { x=0.0; y=0.0; dia=0.7mm;                }
+                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=0.7mm;                }
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 bottom = 1
+                 mask = 1
+                }
+                clearance=0.0
+               }
              }
-             clearance=0.0
-              li:ps_poly {
-               -0.55mm  
-               -0.3mm  
-               0.55mm  
-               -0.3mm  
-               0.55mm  
-               0.3mm  
-               -0.55mm  
-               0.3mm  
-              }
-            }
-          }
-        }
-       }
+           }
 
-        li:objects {
-         ha:padstack_ref.8385 {
-          proto=0; x=47.25mm; y=28.45mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-          ha:flags {
-           clearline=1
-          }
+           ha:ps_proto_v6.4 {
+             hdia=0.0; hplated=0; htop=0; hbottom=0;
+             li:shape {
 
-          li:thermal {
-          }
+               ha:ps_shape_v4 {
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 top = 1
+                }
+                clearance=0.2mm
+                 li:ps_poly {
+                  -0.25mm  
+                  -0.15mm  
+                  0.25mm  
+                  -0.15mm  
+                  0.25mm  
+                  0.15mm  
+                  -0.25mm  
+                  0.15mm  
+                 }
+               }
 
-          ha:attributes {
-            term=1
-            name=1
-          }
-         }
-         ha:padstack_ref.8386 {
-          proto=0; x=45.35mm; y=28.45mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-          ha:flags {
-           clearline=1
-          }
+               ha:ps_shape_v4 {
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 mask = 1
+                }
+                clearance=0.0
+                 li:ps_poly {
+                  -0.3mm  
+                  -0.2mm  
+                  0.3mm  
+                  -0.2mm  
+                  0.3mm  
+                  0.2mm  
+                  -0.3mm  
+                  0.2mm  
+                 }
+               }
 
-          li:thermal {
+               ha:ps_shape_v4 {
+                ha:combining { auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 paste = 1
+                }
+                clearance=0.0
+                 li:ps_poly {
+                  -0.25mm  
+                  -0.15mm  
+                  0.25mm  
+                  -0.15mm  
+                  0.25mm  
+                  0.15mm  
+                  -0.25mm  
+                  0.15mm  
+                 }
+               }
+             }
+           }
           }
 
-          ha:attributes {
-            term=2
-            name=2
-          }
-         }
-         ha:padstack_ref.8387 {
-          proto=0; x=46.3mm; y=30.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-          ha:flags {
-           clearline=1
-          }
-
-          li:thermal {
-          }
-
-          ha:attributes {
-            term=3
-            name=3
-          }
-         }
-        }
-        li:layers {
-
-         ha:subc-aux {
-          lid=0
-          ha:combining {          }
-
            li:objects {
-            ha:line.8329 {
-             x1=46.3mm; y1=29.6mm; x2=46.3mm; y2=29.6mm; thickness=0.1mm; clearance=0.0;
-             ha:attributes {
-               subc-role=origin
-             }
-            }
-            ha:line.8332 {
-             x1=46.3mm; y1=29.6mm; x2=46.3mm; y2=30.6mm; thickness=0.1mm; clearance=0.0;
-             ha:attributes {
-               subc-role=x
-             }
-            }
-            ha:line.8335 {
-             x1=46.3mm; y1=29.6mm; x2=45.3mm; y2=29.6mm; thickness=0.1mm; clearance=0.0;
-             ha:attributes {
-               subc-role=y
-             }
-            }
-            ha:line.8338 {
-             x1=46.3mm; y1=29.6mm; x2=46.3mm; y2=29.6mm; thickness=0.1mm; clearance=0.0;
-             ha:attributes {
-               subc-role=pnp-origin
-             }
-            }
-           }
-           ha:type {
-            top = 1
-            misc = 1
-            virtual = 1
-           }
-         }
-
-         ha:top-silkscreen {
-          lid=1
-          ha:combining {          }
-
-           li:objects {
-            ha:line.8341 {
-             x1=47.86mm; y1=28.85mm; x2=47.86mm; y2=30.35mm; thickness=0.2mm; clearance=0.0;
-            }
-            ha:line.8344 {
-             x1=47.86mm; y1=30.35mm; x2=46.9mm; y2=30.35mm; thickness=0.2mm; clearance=0.0;
-            }
-            ha:line.8347 {
-             x1=45.7mm; y1=30.35mm; x2=44.74mm; y2=30.35mm; thickness=0.2mm; clearance=0.0;
-            }
-            ha:line.8350 {
-             x1=44.74mm; y1=30.35mm; x2=44.74mm; y2=28.85mm; thickness=0.2mm; clearance=0.0;
-            }
-            ha:line.8353 {
-             x1=46.65mm; y1=28.85mm; x2=45.95mm; y2=28.85mm; thickness=0.2mm; clearance=0.0;
-            }
-            ha:line.8356 {
-             x1=47.85mm; y1=28.85mm; x2=47.85mm; y2=27.6mm; thickness=0.2mm; clearance=0.0;
-            }
-            ha:line.8359 {
-             x1=47.85mm; y1=27.6mm; x2=46.95mm; y2=27.6mm; thickness=0.2mm; clearance=0.0;
-            }
-           }
-           ha:type {
-            silk = 1
-            top = 1
-           }
-         }
-
-         ha:top-assembly {
-          lid=2
-          ha:combining {          }
-
-           li:objects {
-            ha:line.8362 {
-             x1=46.3mm; y1=28.9mm; x2=46.3mm; y2=30.3mm; thickness=0.1mm; clearance=0.0;
-            }
-            ha:line.8365 {
-             x1=47.0mm; y1=29.6mm; x2=45.6mm; y2=29.6mm; thickness=0.1mm; clearance=0.0;
-            }
-            ha:line.8368 {
-             x1=47.76mm; y1=29.6mm; x2=47.76mm; y2=30.25mm; thickness=0.1mm; clearance=0.0;
-            }
-            ha:line.8371 {
-             x1=47.76mm; y1=30.25mm; x2=44.84mm; y2=30.25mm; thickness=0.1mm; clearance=0.0;
-            }
-            ha:line.8374 {
-             x1=44.84mm; y1=30.25mm; x2=44.84mm; y2=28.95mm; thickness=0.1mm; clearance=0.0;
-            }
-            ha:line.8377 {
-             x1=44.84mm; y1=28.95mm; x2=1.85472441in; y2=28.95mm; thickness=0.1mm; clearance=0.0;
-            }
-            ha:line.8380 {
-             x1=1.85472441in; y1=28.95mm; x2=47.76mm; y2=29.6mm; thickness=0.1mm; clearance=0.0;
-            }
-            ha:arc.8383 {
-             x=46.3mm; y=29.6mm; width=0.5mm; height=0.5mm; astart=270.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
-            }
-            ha:text.8384 {
-             string=%a.parent.refdes%; x=46.3mm; y=29.6mm; scale=100; fid=0;
+            ha:padstack_ref.25253 {
+             proto=0; x=23.06mm; y=9.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
              ha:flags {
-              dyntext=1
-              floater=1
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=1
+               name=1
+             }
+            }
+            ha:padstack_ref.25254 {
+             proto=0; x=23.06mm; y=10.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=2
+               name=2
+             }
+            }
+            ha:padstack_ref.25255 {
+             proto=0; x=23.06mm; y=10.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=3
+               name=3
+             }
+            }
+            ha:padstack_ref.25256 {
+             proto=0; x=23.06mm; y=11.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=4
+               name=4
+             }
+            }
+            ha:padstack_ref.25257 {
+             proto=0; x=23.06mm; y=11.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=5
+               name=5
+             }
+            }
+            ha:padstack_ref.25258 {
+             proto=0; x=23.06mm; y=12.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=6
+               name=6
+             }
+            }
+            ha:padstack_ref.25259 {
+             proto=0; x=23.06mm; y=12.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=7
+               name=7
+             }
+            }
+            ha:padstack_ref.25260 {
+             proto=0; x=23.06mm; y=13.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=8
+               name=8
+             }
+            }
+            ha:padstack_ref.25261 {
+             proto=0; x=23.06mm; y=13.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=9
+               name=9
+             }
+            }
+            ha:padstack_ref.25262 {
+             proto=0; x=23.06mm; y=14.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=10
+               name=10
+             }
+            }
+            ha:padstack_ref.25263 {
+             proto=0; x=23.06mm; y=14.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=11
+               name=11
+             }
+            }
+            ha:padstack_ref.25264 {
+             proto=0; x=23.06mm; y=15.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=12
+               name=12
+             }
+            }
+            ha:padstack_ref.25265 {
+             proto=1; x=21.85mm; y=9.625mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=13
+               name=13
+             }
+            }
+            ha:padstack_ref.25266 {
+             proto=1; x=21.15mm; y=10.025mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=14
+               name=14
+             }
+            }
+            ha:padstack_ref.25267 {
+             proto=1; x=21.15mm; y=10.825mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=15
+               name=15
+             }
+            }
+            ha:padstack_ref.25268 {
+             proto=1; x=21.85mm; y=11.225mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=16
+               name=16
+             }
+            }
+            ha:padstack_ref.25269 {
+             proto=1; x=21.15mm; y=11.625mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+               li:2 {
+                on  
+                round  
+                noshape  
+               }
+               li:3 {
+                on  
+                round  
+                noshape  
+               }
+             }
+
+             ha:attributes {
+               term=17
+               name=17
+             }
+            }
+            ha:padstack_ref.25270 {
+             proto=1; x=21.85mm; y=12.043mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=18
+               name=18
+             }
+            }
+            ha:padstack_ref.25271 {
+             proto=1; x=21.85mm; y=12.957mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=19
+               name=19
+             }
+            }
+            ha:padstack_ref.25272 {
+             proto=1; x=21.15mm; y=13.375mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=20
+               name=20
+             }
+            }
+            ha:padstack_ref.25273 {
+             proto=1; x=21.85mm; y=13.775mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=21
+               name=21
+             }
+            }
+            ha:padstack_ref.25274 {
+             proto=1; x=21.15mm; y=14.175mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+               li:2 {
+                on  
+                round  
+                noshape  
+               }
+               li:3 {
+                on  
+                round  
+                noshape  
+               }
+             }
+
+             ha:attributes {
+               term=22
+               name=22
+             }
+            }
+            ha:padstack_ref.25275 {
+             proto=1; x=21.15mm; y=14.975mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=23
+               name=23
+             }
+            }
+            ha:padstack_ref.25276 {
+             proto=1; x=21.85mm; y=15.375mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=24
+               name=24
+             }
+            }
+            ha:padstack_ref.25277 {
+             proto=2; x=21.25mm; y=8.295mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=25
+               name=25
+             }
+            }
+            ha:padstack_ref.25278 {
+             proto=2; x=21.25mm; y=16.705mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=26
+               name=26
+             }
+            }
+            ha:padstack_ref.25279 {
+             proto=2; x=16.86mm; y=312.4015748mil; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=27
+               name=27
+             }
+            }
+            ha:padstack_ref.25280 {
+             proto=2; x=16.86mm; y=17.065mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=28
+               name=28
+             }
+            }
+            ha:padstack_ref.25281 {
+             proto=3; x=22.5mm; y=8.825mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=MH1
+               name=MH1
+             }
+            }
+            ha:padstack_ref.25282 {
+             proto=3; x=22.5mm; y=16.175mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=MH2
+               name=MH2
+             }
+            }
+            ha:padstack_ref.25283 {
+             proto=4; x=24.05mm; y=9.055mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=29
+               name=29
+             }
+            }
+            ha:padstack_ref.25284 {
+             proto=4; x=24.05mm; y=15.945mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=30
+               name=30
              }
-             rot = 270.000000
             }
            }
-           ha:type {
-            top = 1
-            doc = 1
-           }
-           purpose = assy
-         }
+           li:layers {
 
-         ha:top-courtyard {
-          lid=3
-          ha:combining {          }
+            ha:subc-aux {
+             lid=0
+             ha:combining {             }
+
+              li:objects {
+               ha:line.25196 {
+                x1=22.5mm; y1=12.5mm; x2=22.5mm; y2=12.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+
+                ha:attributes {
+                  subc-role=origin
+                }
+               }
+               ha:line.25199 {
+                x1=22.5mm; y1=12.5mm; x2=22.5mm; y2=13.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+
+                ha:attributes {
+                  subc-role=x
+                }
+               }
+               ha:line.25202 {
+                x1=22.5mm; y1=12.5mm; x2=21.5mm; y2=12.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+
+                ha:attributes {
+                  subc-role=y
+                }
+               }
+               ha:line.25205 {
+                x1=19.33mm; y1=12.5mm; x2=19.33mm; y2=12.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+
+                ha:attributes {
+                  subc-role=pnp-origin
+                }
+               }
+              }
+              ha:type {
+               top = 1
+               misc = 1
+               virtual = 1
+              }
+            }
+
+            ha:top-silkscreen {
+             lid=1
+             ha:combining {             }
+
+              li:objects {
+               ha:line.25208 {
+                x1=24.43mm; y1=7.45mm; x2=24.43mm; y2=8.505mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25211 {
+                x1=24.43mm; y1=9.605mm; x2=24.43mm; y2=606.1023622mil; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25214 {
+                x1=24.43mm; y1=16.495mm; x2=24.43mm; y2=17.55mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25217 {
+                x1=24.43mm; y1=17.55mm; x2=17.91mm; y2=17.55mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25220 {
+                x1=15.81mm; y1=17.55mm; x2=14.23mm; y2=17.55mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25223 {
+                x1=14.23mm; y1=17.55mm; x2=14.23mm; y2=7.45mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25226 {
+                x1=24.43mm; y1=7.45mm; x2=17.91mm; y2=7.45mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25229 {
+                x1=15.81mm; y1=7.45mm; x2=14.23mm; y2=7.45mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+              }
+              ha:type {
+               silk = 1
+               top = 1
+              }
+            }
+
+            ha:top-assembly {
+             lid=2
+             ha:combining {             }
+
+              li:objects {
+               ha:line.25233 {
+                x1=19.33mm; y1=11.8mm; x2=19.33mm; y2=13.2mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25236 {
+                x1=20.03mm; y1=12.5mm; x2=18.63mm; y2=12.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25239 {
+                x1=24.33mm; y1=7.55mm; x2=24.33mm; y2=17.45mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25242 {
+                x1=24.33mm; y1=17.45mm; x2=14.33mm; y2=17.45mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25245 {
+                x1=14.33mm; y1=17.45mm; x2=14.33mm; y2=7.55mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25248 {
+                x1=14.33mm; y1=7.55mm; x2=24.33mm; y2=7.55mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:arc.25251 {
+                x=19.33mm; y=12.5mm; width=0.5mm; height=0.5mm; astart=270.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:text.25232 {
+                string=%a.parent.refdes%; x=19.33mm; y=12.5mm; scale=100; fid=0;
+                ha:flags {
+                 dyntext=1
+                 floater=1
+                 lock=1
+                }
+                rot = 270.000000
+               }
+              }
+              ha:type {
+               top = 1
+               doc = 1
+              }
+              purpose = assy
+            }
+
+            ha:top-courtyard {
+             lid=3
+             ha:combining {             }
+
+              li:objects {
+               ha:polygon.25285 {
+                li:geometry {
+                  ta:contour {
+                   { 24.58mm; 7.235mm }
+                   { 24.58mm; 17.765mm }
+                   { 14.08mm; 17.765mm }
+                   { 14.08mm; 7.235mm }
+                  }
+                }
+
+                ha:flags {
+                 lock=1
+                }
+               }
+              }
+              ha:type {
+               top = 1
+               doc = 1
+              }
+              purpose = ko.courtyard
+            }
+           }
+          }
+           uid = AQV3WupyorPasUcZHO0AAAAb
+ ha:flags ={ lock=1
+ };          }
+          ha:subc.25307 {
+           ha:attributes {
+            value=USB-C receptacle
+            footprint=CONNECTOR_XKB_U262-24XN-4BV60.lht
+            refdes=J2
+           }
+          ha:data {
+                    li:padstack_prototypes {
+
+           ha:ps_proto_v6.0 {
+             hdia=0.0; hplated=0; htop=0; hbottom=0;
+             li:shape {
+
+               ha:ps_shape_v4 {
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 top = 1
+                }
+                clearance=0.2mm
+                 li:ps_poly {
+                  -0.15mm  
+                  -0.45mm  
+                  0.15mm  
+                  -0.45mm  
+                  0.15mm  
+                  0.45mm  
+                  -0.15mm  
+                  0.45mm  
+                 }
+               }
+
+               ha:ps_shape_v4 {
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 mask = 1
+                }
+                clearance=0.0
+                 li:ps_poly {
+                  -0.2mm  
+                  -0.5mm  
+                  0.2mm  
+                  -0.5mm  
+                  0.2mm  
+                  0.5mm  
+                  -0.2mm  
+                  0.5mm  
+                 }
+               }
+
+               ha:ps_shape_v4 {
+                ha:combining { auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 paste = 1
+                }
+                clearance=0.0
+                 li:ps_poly {
+                  -0.15mm  
+                  -0.45mm  
+                  0.15mm  
+                  -0.45mm  
+                  0.15mm  
+                  0.45mm  
+                  -0.15mm  
+                  0.45mm  
+                 }
+               }
+             }
+           }
+
+           ha:ps_proto_v6.1 {
+             hdia=0.4mm; hplated=1; htop=0; hbottom=0;
+             li:shape {
+
+               ha:ps_shape_v4 {
+                ha:ps_circ { x=0.0; y=0.0; dia=0.7mm;                }
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 top = 1
+                }
+                clearance=0.2mm
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_circ { x=0.0; y=0.0; dia=0.75mm;                }
+                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=0.7mm;                }
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 intern = 1
+                }
+                clearance=0.2mm
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_circ { x=0.0; y=0.0; dia=0.7mm;                }
+                ha:combining {                }
+                ha:layer_mask {
+                 bottom = 1
+                 copper = 1
+                }
+                clearance=0.2mm
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_circ { x=0.0; y=0.0; dia=0.75mm;                }
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 bottom = 1
+                 mask = 1
+                }
+                clearance=0.0
+               }
+             }
+           }
+
+           ha:ps_proto_v6.2 {
+             hdia=0.0; hplated=1; htop=0; hbottom=0;
+             li:shape {
+
+               ha:ps_shape_v4 {
+                ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.5mm; square=0;                }
+                ha:combining { auto=1;                }
+                ha:layer_mask {
+                 mech = 1
+                }
+                clearance=0.0
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.9mm; square=0;                }
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 top = 1
+                }
+                clearance=0.2mm
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=1.0mm; square=0;                }
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 mask = 1
+                }
+                clearance=0.0
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.9mm; square=0;                }
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 intern = 1
+                }
+                clearance=0.2mm
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.9mm; square=0;                }
+                ha:combining {                }
+                ha:layer_mask {
+                 bottom = 1
+                 copper = 1
+                }
+                clearance=0.2mm
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=1.0mm; square=0;                }
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 bottom = 1
+                 mask = 1
+                }
+                clearance=0.0
+               }
+             }
+           }
+
+           ha:ps_proto_v6.3 {
+             hdia=0.65mm; hplated=0; htop=0; hbottom=0;
+             li:shape {
+
+               ha:ps_shape_v4 {
+                ha:ps_circ { x=0.0; y=0.0; dia=0.7mm;                }
+                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=0.7mm;                }
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 bottom = 1
+                 mask = 1
+                }
+                clearance=0.0
+               }
+             }
+           }
+
+           ha:ps_proto_v6.4 {
+             hdia=0.0; hplated=0; htop=0; hbottom=0;
+             li:shape {
+
+               ha:ps_shape_v4 {
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 top = 1
+                }
+                clearance=0.2mm
+                 li:ps_poly {
+                  -0.25mm  
+                  -0.15mm  
+                  0.25mm  
+                  -0.15mm  
+                  0.25mm  
+                  0.15mm  
+                  -0.25mm  
+                  0.15mm  
+                 }
+               }
+
+               ha:ps_shape_v4 {
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 mask = 1
+                }
+                clearance=0.0
+                 li:ps_poly {
+                  -0.3mm  
+                  -0.2mm  
+                  0.3mm  
+                  -0.2mm  
+                  0.3mm  
+                  0.2mm  
+                  -0.3mm  
+                  0.2mm  
+                 }
+               }
+
+               ha:ps_shape_v4 {
+                ha:combining { auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 paste = 1
+                }
+                clearance=0.0
+                 li:ps_poly {
+                  -0.25mm  
+                  -0.15mm  
+                  0.25mm  
+                  -0.15mm  
+                  0.25mm  
+                  0.15mm  
+                  -0.25mm  
+                  0.15mm  
+                 }
+               }
+             }
+           }
+          }
 
            li:objects {
-            ha:polygon.8388 {
-             li:geometry {
-               ta:contour {
-                { 47.8mm; 27.65mm }
-                { 47.8mm; 28.7mm }
-                { 48.01mm; 28.7mm }
-                { 48.01mm; 30.5mm }
-                { 46.85mm; 30.5mm }
-                { 46.85mm; 31.55mm }
-                { 45.75mm; 31.55mm }
-                { 45.75mm; 30.5mm }
-                { 44.59mm; 30.5mm }
-                { 44.59mm; 28.7mm }
-                { 44.8mm; 28.7mm }
-                { 44.8mm; 27.65mm }
-               }
+            ha:padstack_ref.25365 {
+             proto=0; x=23.06mm; y=23.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
              }
-            }
-           }
-           ha:type {
-            top = 1
-            doc = 1
-           }
-           purpose = ko.courtyard
-         }
-        }
-       }
-        uid = fNBhogi9RvPCwmAkAQYAAAAf
-       }
-        ha:subc.25195 {
-         ha:attributes {
-          value=USB-C receptacle
-          footprint=CONNECTOR_XKB_U262-24XN-4BV60.lht
-          refdes=J1
-         }
-        ha:data {
-                li:padstack_prototypes {
 
-         ha:ps_proto_v6.0 {
-           hdia=0.0; hplated=0; htop=0; hbottom=0;
-           li:shape {
-
-             ha:ps_shape_v4 {
-              ha:combining {              }
-              ha:layer_mask {
-               copper = 1
-               top = 1
-              }
-              clearance=0.2mm
-               li:ps_poly {
-                -0.15mm  
-                -0.45mm  
-                0.15mm  
-                -0.45mm  
-                0.15mm  
-                0.45mm  
-                -0.15mm  
-                0.45mm  
+             li:thermal {
+               li:2 {
+                on  
+                sharp  
+                noshape  
                }
              }
 
-             ha:ps_shape_v4 {
-              ha:combining { sub=1; auto=1;              }
-              ha:layer_mask {
-               top = 1
-               mask = 1
-              }
-              clearance=0.0
-               li:ps_poly {
-                -0.2mm  
-                -0.5mm  
-                0.2mm  
-                -0.5mm  
-                0.2mm  
-                0.5mm  
-                -0.2mm  
-                0.5mm  
+             ha:attributes {
+               term=1
+               name=1
+             }
+            }
+            ha:padstack_ref.25366 {
+             proto=0; x=23.06mm; y=24.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=2
+               name=2
+             }
+            }
+            ha:padstack_ref.25367 {
+             proto=0; x=23.06mm; y=24.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=3
+               name=3
+             }
+            }
+            ha:padstack_ref.25368 {
+             proto=0; x=23.06mm; y=25.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=4
+               name=4
+             }
+            }
+            ha:padstack_ref.25369 {
+             proto=0; x=23.06mm; y=25.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=5
+               name=5
+             }
+            }
+            ha:padstack_ref.25370 {
+             proto=0; x=23.06mm; y=26.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=6
+               name=6
+             }
+            }
+            ha:padstack_ref.25371 {
+             proto=0; x=23.06mm; y=26.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+               li:2 {
+                on  
+                sharp  
+                noshape  
                }
              }
 
-             ha:ps_shape_v4 {
-              ha:combining { auto=1;              }
-              ha:layer_mask {
-               top = 1
-               paste = 1
-              }
-              clearance=0.0
-               li:ps_poly {
-                -0.15mm  
-                -0.45mm  
-                0.15mm  
-                -0.45mm  
-                0.15mm  
-                0.45mm  
-                -0.15mm  
-                0.45mm  
-               }
+             ha:attributes {
+               term=7
+               name=7
              }
-           }
-         }
-
-         ha:ps_proto_v6.1 {
-           hdia=0.4mm; hplated=1; htop=0; hbottom=0;
-           li:shape {
-
-             ha:ps_shape_v4 {
-              ha:ps_circ { x=0.0; y=0.0; dia=0.7mm;              }
-              ha:combining {              }
-              ha:layer_mask {
-               copper = 1
-               top = 1
-              }
-              clearance=0.2mm
+            }
+            ha:padstack_ref.25372 {
+             proto=0; x=23.06mm; y=27.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
              }
 
-             ha:ps_shape_v4 {
-              ha:ps_circ { x=0.0; y=0.0; dia=0.75mm;              }
-              ha:combining { sub=1; auto=1;              }
-              ha:layer_mask {
-               top = 1
-               mask = 1
-              }
-              clearance=0.0
+             li:thermal {
              }
 
-             ha:ps_shape_v4 {
-              ha:ps_circ { x=0.0; y=0.0; dia=0.7mm;              }
-              ha:combining {              }
-              ha:layer_mask {
-               copper = 1
-               intern = 1
-              }
-              clearance=0.2mm
+             ha:attributes {
+               term=8
+               name=8
+             }
+            }
+            ha:padstack_ref.25373 {
+             proto=0; x=23.06mm; y=27.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
              }
 
-             ha:ps_shape_v4 {
-              ha:ps_circ { x=0.0; y=0.0; dia=0.7mm;              }
-              ha:combining {              }
-              ha:layer_mask {
-               bottom = 1
-               copper = 1
-              }
-              clearance=0.2mm
+             li:thermal {
              }
 
-             ha:ps_shape_v4 {
-              ha:ps_circ { x=0.0; y=0.0; dia=0.75mm;              }
-              ha:combining { sub=1; auto=1;              }
-              ha:layer_mask {
-               bottom = 1
-               mask = 1
-              }
-              clearance=0.0
+             ha:attributes {
+               term=9
+               name=9
              }
-           }
-         }
-
-         ha:ps_proto_v6.2 {
-           hdia=0.0; hplated=1; htop=0; hbottom=0;
-           li:shape {
-
-             ha:ps_shape_v4 {
-              ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.5mm; square=0;              }
-              ha:combining { auto=1;              }
-              ha:layer_mask {
-               mech = 1
-              }
-              clearance=0.0
+            }
+            ha:padstack_ref.25374 {
+             proto=0; x=23.06mm; y=28.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
              }
 
-             ha:ps_shape_v4 {
-              ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.9mm; square=0;              }
-              ha:combining {              }
-              ha:layer_mask {
-               copper = 1
-               top = 1
-              }
-              clearance=0.2mm
+             li:thermal {
              }
 
-             ha:ps_shape_v4 {
-              ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=1.0mm; square=0;              }
-              ha:combining { sub=1; auto=1;              }
-              ha:layer_mask {
-               top = 1
-               mask = 1
-              }
-              clearance=0.0
+             ha:attributes {
+               term=10
+               name=10
+             }
+            }
+            ha:padstack_ref.25375 {
+             proto=0; x=23.06mm; y=28.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
              }
 
-             ha:ps_shape_v4 {
-              ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.9mm; square=0;              }
-              ha:combining {              }
-              ha:layer_mask {
-               copper = 1
-               intern = 1
-              }
-              clearance=0.2mm
+             li:thermal {
              }
 
-             ha:ps_shape_v4 {
-              ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.9mm; square=0;              }
-              ha:combining {              }
-              ha:layer_mask {
-               bottom = 1
-               copper = 1
-              }
-              clearance=0.2mm
+             ha:attributes {
+               term=11
+               name=11
+             }
+            }
+            ha:padstack_ref.25376 {
+             proto=0; x=23.06mm; y=29.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
              }
 
-             ha:ps_shape_v4 {
-              ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=1.0mm; square=0;              }
-              ha:combining { sub=1; auto=1;              }
-              ha:layer_mask {
-               bottom = 1
-               mask = 1
-              }
-              clearance=0.0
-             }
-           }
-         }
-
-         ha:ps_proto_v6.3 {
-           hdia=0.65mm; hplated=0; htop=0; hbottom=0;
-           li:shape {
-
-             ha:ps_shape_v4 {
-              ha:ps_circ { x=0.0; y=0.0; dia=0.7mm;              }
-              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=0.7mm;              }
-              ha:combining { sub=1; auto=1;              }
-              ha:layer_mask {
-               bottom = 1
-               mask = 1
-              }
-              clearance=0.0
-             }
-           }
-         }
-
-         ha:ps_proto_v6.4 {
-           hdia=0.0; hplated=0; htop=0; hbottom=0;
-           li:shape {
-
-             ha:ps_shape_v4 {
-              ha:combining {              }
-              ha:layer_mask {
-               copper = 1
-               top = 1
-              }
-              clearance=0.2mm
-               li:ps_poly {
-                -0.25mm  
-                -0.15mm  
-                0.25mm  
-                -0.15mm  
-                0.25mm  
-                0.15mm  
-                -0.25mm  
-                0.15mm  
+             li:thermal {
+               li:2 {
+                on  
+                sharp  
+                noshape  
                }
              }
 
-             ha:ps_shape_v4 {
-              ha:combining { sub=1; auto=1;              }
-              ha:layer_mask {
-               top = 1
-               mask = 1
-              }
-              clearance=0.0
-               li:ps_poly {
-                -0.3mm  
-                -0.2mm  
-                0.3mm  
-                -0.2mm  
-                0.3mm  
-                0.2mm  
-                -0.3mm  
-                0.2mm  
+             ha:attributes {
+               term=12
+               name=12
+             }
+            }
+            ha:padstack_ref.25377 {
+             proto=1; x=21.85mm; y=23.625mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+               li:2 {
+                on  
+                round  
+                noshape  
+               }
+               li:3 {
+                on  
+                round  
+                noshape  
                }
              }
 
-             ha:ps_shape_v4 {
-              ha:combining { auto=1;              }
-              ha:layer_mask {
-               top = 1
-               paste = 1
-              }
-              clearance=0.0
-               li:ps_poly {
-                -0.25mm  
-                -0.15mm  
-                0.25mm  
-                -0.15mm  
-                0.25mm  
-                0.15mm  
-                -0.25mm  
-                0.15mm  
+             ha:attributes {
+               term=13
+               name=13
+             }
+            }
+            ha:padstack_ref.25378 {
+             proto=1; x=21.15mm; y=24.025mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=14
+               name=14
+             }
+            }
+            ha:padstack_ref.25379 {
+             proto=1; x=21.15mm; y=24.825mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=15
+               name=15
+             }
+            }
+            ha:padstack_ref.25380 {
+             proto=1; x=21.85mm; y=25.225mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=16
+               name=16
+             }
+            }
+            ha:padstack_ref.25381 {
+             proto=1; x=21.15mm; y=25.625mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=17
+               name=17
+             }
+            }
+            ha:padstack_ref.25382 {
+             proto=1; x=21.85mm; y=26.043mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+               li:2 {
+                on  
+                diag  
+                round  
+                noshape  
+               }
+               li:3 {
+                on  
+                diag  
+                round  
+                noshape  
                }
              }
-           }
-         }
-        }
 
-         li:objects {
-          ha:padstack_ref.25253 {
-           proto=0; x=23.06mm; y=9.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=1
-             name=1
-           }
-          }
-          ha:padstack_ref.25254 {
-           proto=0; x=23.06mm; y=10.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=2
-             name=2
-           }
-          }
-          ha:padstack_ref.25255 {
-           proto=0; x=23.06mm; y=10.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=3
-             name=3
-           }
-          }
-          ha:padstack_ref.25256 {
-           proto=0; x=23.06mm; y=11.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=4
-             name=4
-           }
-          }
-          ha:padstack_ref.25257 {
-           proto=0; x=23.06mm; y=11.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=5
-             name=5
-           }
-          }
-          ha:padstack_ref.25258 {
-           proto=0; x=23.06mm; y=12.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=6
-             name=6
-           }
-          }
-          ha:padstack_ref.25259 {
-           proto=0; x=23.06mm; y=12.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=7
-             name=7
-           }
-          }
-          ha:padstack_ref.25260 {
-           proto=0; x=23.06mm; y=13.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=8
-             name=8
-           }
-          }
-          ha:padstack_ref.25261 {
-           proto=0; x=23.06mm; y=13.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=9
-             name=9
-           }
-          }
-          ha:padstack_ref.25262 {
-           proto=0; x=23.06mm; y=14.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=10
-             name=10
-           }
-          }
-          ha:padstack_ref.25263 {
-           proto=0; x=23.06mm; y=14.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=11
-             name=11
-           }
-          }
-          ha:padstack_ref.25264 {
-           proto=0; x=23.06mm; y=15.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=12
-             name=12
-           }
-          }
-          ha:padstack_ref.25265 {
-           proto=1; x=21.85mm; y=9.625mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=13
-             name=13
-           }
-          }
-          ha:padstack_ref.25266 {
-           proto=1; x=21.15mm; y=10.025mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=14
-             name=14
-           }
-          }
-          ha:padstack_ref.25267 {
-           proto=1; x=21.15mm; y=10.825mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=15
-             name=15
-           }
-          }
-          ha:padstack_ref.25268 {
-           proto=1; x=21.85mm; y=11.225mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=16
-             name=16
-           }
-          }
-          ha:padstack_ref.25269 {
-           proto=1; x=21.15mm; y=11.625mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-             li:2 {
-              on  
-              round  
-              noshape  
-             }
-             li:3 {
-              on  
-              round  
-              noshape  
-             }
-           }
-
-           ha:attributes {
-             term=17
-             name=17
-           }
-          }
-          ha:padstack_ref.25270 {
-           proto=1; x=21.85mm; y=12.043mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=18
-             name=18
-           }
-          }
-          ha:padstack_ref.25271 {
-           proto=1; x=21.85mm; y=12.957mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=19
-             name=19
-           }
-          }
-          ha:padstack_ref.25272 {
-           proto=1; x=21.15mm; y=13.375mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=20
-             name=20
-           }
-          }
-          ha:padstack_ref.25273 {
-           proto=1; x=21.85mm; y=13.775mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=21
-             name=21
-           }
-          }
-          ha:padstack_ref.25274 {
-           proto=1; x=21.15mm; y=14.175mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-             li:2 {
-              on  
-              round  
-              noshape  
-             }
-             li:3 {
-              on  
-              round  
-              noshape  
-             }
-           }
-
-           ha:attributes {
-             term=22
-             name=22
-           }
-          }
-          ha:padstack_ref.25275 {
-           proto=1; x=21.15mm; y=14.975mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=23
-             name=23
-           }
-          }
-          ha:padstack_ref.25276 {
-           proto=1; x=21.85mm; y=15.375mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=24
-             name=24
-           }
-          }
-          ha:padstack_ref.25277 {
-           proto=2; x=21.25mm; y=8.295mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=25
-             name=25
-           }
-          }
-          ha:padstack_ref.25278 {
-           proto=2; x=21.25mm; y=16.705mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=26
-             name=26
-           }
-          }
-          ha:padstack_ref.25279 {
-           proto=2; x=16.86mm; y=312.4015748mil; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=27
-             name=27
-           }
-          }
-          ha:padstack_ref.25280 {
-           proto=2; x=16.86mm; y=17.065mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=28
-             name=28
-           }
-          }
-          ha:padstack_ref.25281 {
-           proto=3; x=22.5mm; y=8.825mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=MH1
-             name=MH1
-           }
-          }
-          ha:padstack_ref.25282 {
-           proto=3; x=22.5mm; y=16.175mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=MH2
-             name=MH2
-           }
-          }
-          ha:padstack_ref.25283 {
-           proto=4; x=24.05mm; y=9.055mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=29
-             name=29
-           }
-          }
-          ha:padstack_ref.25284 {
-           proto=4; x=24.05mm; y=15.945mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-           ha:flags {
-            clearline=1
-            lock=1
-           }
-
-           li:thermal {
-           }
-
-           ha:attributes {
-             term=30
-             name=30
-           }
-          }
-         }
-         li:layers {
-
-          ha:subc-aux {
-           lid=0
-           ha:combining {           }
-
-            li:objects {
-             ha:line.25196 {
-              x1=22.5mm; y1=12.5mm; x2=22.5mm; y2=12.5mm; thickness=0.1mm; clearance=0.0;
-              ha:attributes {
-                subc-role=origin
-              }
- ha:flags ={ lock=1
- };             }
-             ha:line.25199 {
-              x1=22.5mm; y1=12.5mm; x2=22.5mm; y2=13.5mm; thickness=0.1mm; clearance=0.0;
-              ha:attributes {
-                subc-role=x
-              }
- ha:flags ={ lock=1
- };             }
-             ha:line.25202 {
-              x1=22.5mm; y1=12.5mm; x2=21.5mm; y2=12.5mm; thickness=0.1mm; clearance=0.0;
-              ha:attributes {
-                subc-role=y
-              }
- ha:flags ={ lock=1
- };             }
-             ha:line.25205 {
-              x1=19.33mm; y1=12.5mm; x2=19.33mm; y2=12.5mm; thickness=0.1mm; clearance=0.0;
-              ha:attributes {
-                subc-role=pnp-origin
-              }
- ha:flags ={ lock=1
- };             }
-            }
-            ha:type {
-             top = 1
-             misc = 1
-             virtual = 1
-            }
-          }
-
-          ha:top-silkscreen {
-           lid=1
-           ha:combining {           }
-
-            li:objects {
-             ha:line.25208 {
-              x1=24.43mm; y1=7.45mm; x2=24.43mm; y2=8.505mm; thickness=0.2mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:line.25211 {
-              x1=24.43mm; y1=9.605mm; x2=24.43mm; y2=606.1023622mil; thickness=0.2mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:line.25214 {
-              x1=24.43mm; y1=16.495mm; x2=24.43mm; y2=17.55mm; thickness=0.2mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:line.25217 {
-              x1=24.43mm; y1=17.55mm; x2=17.91mm; y2=17.55mm; thickness=0.2mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:line.25220 {
-              x1=15.81mm; y1=17.55mm; x2=14.23mm; y2=17.55mm; thickness=0.2mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:line.25223 {
-              x1=14.23mm; y1=17.55mm; x2=14.23mm; y2=7.45mm; thickness=0.2mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:line.25226 {
-              x1=24.43mm; y1=7.45mm; x2=17.91mm; y2=7.45mm; thickness=0.2mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:line.25229 {
-              x1=15.81mm; y1=7.45mm; x2=14.23mm; y2=7.45mm; thickness=0.2mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-            }
-            ha:type {
-             silk = 1
-             top = 1
-            }
-          }
-
-          ha:top-assembly {
-           lid=2
-           ha:combining {           }
-
-            li:objects {
-             ha:line.25233 {
-              x1=19.33mm; y1=11.8mm; x2=19.33mm; y2=13.2mm; thickness=0.1mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:line.25236 {
-              x1=20.03mm; y1=12.5mm; x2=18.63mm; y2=12.5mm; thickness=0.1mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:line.25239 {
-              x1=24.33mm; y1=7.55mm; x2=24.33mm; y2=17.45mm; thickness=0.1mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:line.25242 {
-              x1=24.33mm; y1=17.45mm; x2=14.33mm; y2=17.45mm; thickness=0.1mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:line.25245 {
-              x1=14.33mm; y1=17.45mm; x2=14.33mm; y2=7.55mm; thickness=0.1mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:line.25248 {
-              x1=14.33mm; y1=7.55mm; x2=24.33mm; y2=7.55mm; thickness=0.1mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:arc.25251 {
-              x=19.33mm; y=12.5mm; width=0.5mm; height=0.5mm; astart=270.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
- ha:flags ={ lock=1
- };             }
-             ha:text.25232 {
-              string=%a.parent.refdes%; x=19.33mm; y=12.5mm; scale=100; fid=0;
-              ha:flags {
-               dyntext=1
-               floater=1
-               lock=1
-              }
-              rot = 270.000000
+             ha:attributes {
+               term=18
+               name=18
              }
             }
-            ha:type {
-             top = 1
-             doc = 1
+            ha:padstack_ref.25383 {
+             proto=1; x=21.85mm; y=26.957mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=19
+               name=19
+             }
             }
-            purpose = assy
-          }
+            ha:padstack_ref.25384 {
+             proto=1; x=21.15mm; y=27.375mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
 
-          ha:top-courtyard {
-           lid=3
-           ha:combining {           }
+             li:thermal {
+             }
 
-            li:objects {
-             ha:polygon.25285 {
-              li:geometry {
-                ta:contour {
-                 { 24.58mm; 7.235mm }
-                 { 24.58mm; 17.765mm }
-                 { 14.08mm; 17.765mm }
-                 { 14.08mm; 7.235mm }
+             ha:attributes {
+               term=20
+               name=20
+             }
+            }
+            ha:padstack_ref.25385 {
+             proto=1; x=21.85mm; y=27.775mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=21
+               name=21
+             }
+            }
+            ha:padstack_ref.25386 {
+             proto=1; x=21.15mm; y=28.175mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=22
+               name=22
+             }
+            }
+            ha:padstack_ref.25387 {
+             proto=1; x=21.15mm; y=28.975mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=23
+               name=23
+             }
+            }
+            ha:padstack_ref.25388 {
+             proto=1; x=21.85mm; y=29.375mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+               li:2 {
+                on  
+                diag  
+                round  
+                noshape  
+               }
+               li:3 {
+                on  
+                diag  
+                round  
+                noshape  
+               }
+             }
+
+             ha:attributes {
+               term=24
+               name=24
+             }
+            }
+            ha:padstack_ref.25389 {
+             proto=2; x=21.25mm; y=22.295mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+               li:2 {
+                on  
+                diag  
+                round  
+                noshape  
+               }
+               li:3 {
+                on  
+                diag  
+                round  
+                noshape  
+               }
+             }
+
+             ha:attributes {
+               term=25
+               name=25
+             }
+            }
+            ha:padstack_ref.25390 {
+             proto=2; x=21.25mm; y=30.705mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+               li:2 {
+                on  
+                diag  
+                round  
+                noshape  
+               }
+               li:3 {
+                on  
+                diag  
+                round  
+                noshape  
+               }
+             }
+
+             ha:attributes {
+               term=26
+               name=26
+             }
+            }
+            ha:padstack_ref.25391 {
+             proto=2; x=16.86mm; y=21.935mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+               li:2 {
+                on  
+                diag  
+                round  
+                noshape  
+               }
+               li:3 {
+                on  
+                diag  
+                round  
+                noshape  
+               }
+             }
+
+             ha:attributes {
+               term=27
+               name=27
+             }
+            }
+            ha:padstack_ref.25392 {
+             proto=2; x=16.86mm; y=31.065mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+               li:2 {
+                on  
+                diag  
+                round  
+                noshape  
+               }
+               li:3 {
+                on  
+                diag  
+                round  
+                noshape  
+               }
+             }
+
+             ha:attributes {
+               term=28
+               name=28
+             }
+            }
+            ha:padstack_ref.25393 {
+             proto=3; x=22.5mm; y=22.825mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=MH1
+               name=MH1
+             }
+            }
+            ha:padstack_ref.25394 {
+             proto=3; x=22.5mm; y=30.175mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=MH2
+               name=MH2
+             }
+            }
+            ha:padstack_ref.25395 {
+             proto=4; x=24.05mm; y=23.055mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=29
+               name=29
+             }
+            }
+            ha:padstack_ref.25396 {
+             proto=4; x=24.05mm; y=29.945mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=30
+               name=30
+             }
+            }
+           }
+           li:layers {
+
+            ha:subc-aux {
+             lid=0
+             ha:combining {             }
+
+              li:objects {
+               ha:line.25308 {
+                x1=22.5mm; y1=26.5mm; x2=22.5mm; y2=26.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 selected=1
                 }
+
+                ha:attributes {
+                  subc-role=origin
+                }
+               }
+               ha:line.25311 {
+                x1=22.5mm; y1=26.5mm; x2=22.5mm; y2=27.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 selected=1
+                }
+
+                ha:attributes {
+                  subc-role=x
+                }
+               }
+               ha:line.25314 {
+                x1=22.5mm; y1=26.5mm; x2=21.5mm; y2=26.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 selected=1
+                }
+
+                ha:attributes {
+                  subc-role=y
+                }
+               }
+               ha:line.25317 {
+                x1=19.33mm; y1=26.5mm; x2=19.33mm; y2=26.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 selected=1
+                }
+
+                ha:attributes {
+                  subc-role=pnp-origin
+                }
+               }
+              }
+              ha:type {
+               top = 1
+               misc = 1
+               virtual = 1
               }
- ha:flags ={ lock=1
- };             }
             }
-            ha:type {
-             top = 1
-             doc = 1
+
+            ha:top-silkscreen {
+             lid=1
+             ha:combining {             }
+
+              li:objects {
+               ha:line.25320 {
+                x1=24.43mm; y1=21.45mm; x2=24.43mm; y2=22.505mm; thickness=0.2mm; clearance=0.0;
+               }
+               ha:line.25323 {
+                x1=24.43mm; y1=23.605mm; x2=24.43mm; y2=29.395mm; thickness=0.2mm; clearance=0.0;
+               }
+               ha:line.25326 {
+                x1=24.43mm; y1=30.495mm; x2=24.43mm; y2=31.55mm; thickness=0.2mm; clearance=0.0;
+               }
+               ha:line.25329 {
+                x1=24.43mm; y1=31.55mm; x2=17.91mm; y2=31.55mm; thickness=0.2mm; clearance=0.0;
+               }
+               ha:line.25332 {
+                x1=15.81mm; y1=31.55mm; x2=14.23mm; y2=31.55mm; thickness=0.2mm; clearance=0.0;
+               }
+               ha:line.25335 {
+                x1=14.23mm; y1=31.55mm; x2=14.23mm; y2=21.45mm; thickness=0.2mm; clearance=0.0;
+               }
+               ha:line.25338 {
+                x1=24.43mm; y1=21.45mm; x2=17.91mm; y2=21.45mm; thickness=0.2mm; clearance=0.0;
+               }
+               ha:line.25341 {
+                x1=15.81mm; y1=21.45mm; x2=14.23mm; y2=21.45mm; thickness=0.2mm; clearance=0.0;
+               }
+              }
+              ha:type {
+               silk = 1
+               top = 1
+              }
             }
-            purpose = ko.courtyard
+
+            ha:top-assembly {
+             lid=2
+             ha:combining {             }
+
+              li:objects {
+               ha:line.25345 {
+                x1=19.33mm; y1=25.8mm; x2=19.33mm; y2=27.2mm; thickness=0.1mm; clearance=0.0;
+               }
+               ha:line.25348 {
+                x1=20.03mm; y1=26.5mm; x2=18.63mm; y2=26.5mm; thickness=0.1mm; clearance=0.0;
+               }
+               ha:line.25351 {
+                x1=24.33mm; y1=21.55mm; x2=24.33mm; y2=31.45mm; thickness=0.1mm; clearance=0.0;
+               }
+               ha:line.25354 {
+                x1=24.33mm; y1=31.45mm; x2=14.33mm; y2=31.45mm; thickness=0.1mm; clearance=0.0;
+               }
+               ha:line.25357 {
+                x1=14.33mm; y1=31.45mm; x2=14.33mm; y2=21.55mm; thickness=0.1mm; clearance=0.0;
+               }
+               ha:line.25360 {
+                x1=14.33mm; y1=21.55mm; x2=24.33mm; y2=21.55mm; thickness=0.1mm; clearance=0.0;
+               }
+               ha:arc.25363 {
+                x=19.33mm; y=26.5mm; width=0.5mm; height=0.5mm; astart=270.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
+               }
+               ha:text.25344 {
+                string=%a.parent.refdes%; x=19.33mm; y=26.5mm; scale=100; fid=0;
+                ha:flags {
+                 dyntext=1
+                 floater=1
+                }
+                rot = 270.000000
+               }
+              }
+              ha:type {
+               top = 1
+               doc = 1
+              }
+              purpose = assy
+            }
+
+            ha:top-courtyard {
+             lid=3
+             ha:combining {             }
+
+              li:objects {
+               ha:polygon.25397 {
+                li:geometry {
+                  ta:contour {
+                   { 24.58mm; 21.235mm }
+                   { 24.58mm; 31.765mm }
+                   { 14.08mm; 31.765mm }
+                   { 14.08mm; 21.235mm }
+                  }
+                }
+               }
+              }
+              ha:type {
+               top = 1
+               doc = 1
+              }
+              purpose = ko.courtyard
+            }
+           }
           }
-         }
-        }
-         uid = AQV3WupyorPasUcZHO0AAAAb
+           uid = AQV3WupyorPasUcZHO0AAAAd
+          }
+          ha:subc.25953 {
+           ha:attributes {
+            value=CR1220
+            footprint=CONNECTOR_MY-1220-03.lht
+            refdes=B1
+           }
+          ha:data {
+                    li:padstack_prototypes {
+
+           ha:ps_proto_v6.0 {
+             hdia=0.0; hplated=0; htop=0; hbottom=0;
+             li:shape {
+
+               ha:ps_shape_v4 {
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 top = 1
+                }
+                clearance=0.2mm
+                 li:ps_poly {
+                  -1.95mm  
+                  -2.1mm  
+                  1.95mm  
+                  -2.1mm  
+                  1.95mm  
+                  2.1mm  
+                  -1.95mm  
+                  2.1mm  
+                 }
+               }
+
+               ha:ps_shape_v4 {
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 mask = 1
+                }
+                clearance=0.0
+                 li:ps_poly {
+                  -2.0mm  
+                  -2.15mm  
+                  2.0mm  
+                  -2.15mm  
+                  2.0mm  
+                  2.15mm  
+                  -2.0mm  
+                  2.15mm  
+                 }
+               }
+
+               ha:ps_shape_v4 {
+                ha:combining { auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 paste = 1
+                }
+                clearance=0.0
+                 li:ps_poly {
+                  -1.95mm  
+                  -2.1mm  
+                  1.95mm  
+                  -2.1mm  
+                  1.95mm  
+                  2.1mm  
+                  -1.95mm  
+                  2.1mm  
+                 }
+               }
+             }
+           }
+
+           ha:ps_proto_v6.1 {
+             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=9.0mm;                }
+                ha:combining {                }
+                ha:layer_mask {
+                 copper = 1
+                 top = 1
+                }
+                clearance=0.2mm
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_circ { x=0.0; y=0.0; dia=9.05mm;                }
+                ha:combining { sub=1; auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 mask = 1
+                }
+                clearance=0.0
+               }
+
+               ha:ps_shape_v4 {
+                ha:ps_circ { x=0.0; y=0.0; dia=9.0mm;                }
+                ha:combining { auto=1;                }
+                ha:layer_mask {
+                 top = 1
+                 paste = 1
+                }
+                clearance=0.0
+               }
+             }
+           }
+          }
+
+           li:objects {
+            ha:padstack_ref.26013 {
+             proto=0; x=46.0mm; y=11.95mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=1
+               name=1
+             }
+            }
+            ha:padstack_ref.26014 {
+             proto=0; x=46.0mm; y=27.05mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+             }
+
+             ha:attributes {
+               term=2
+               name=2
+             }
+            }
+            ha:padstack_ref.26015 {
+             proto=1; x=46.0mm; y=19.5mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+             ha:flags {
+              clearline=1
+              lock=1
+             }
+
+             li:thermal {
+               li:2 {
+                on  
+                diag  
+                round  
+                noshape  
+               }
+             }
+
+             ha:attributes {
+               term=3
+               name=3
+             }
+            }
+           }
+           li:layers {
+
+            ha:subc-aux {
+             lid=0
+             ha:combining {             }
+
+              li:objects {
+               ha:line.25954 {
+                x1=46.0mm; y1=19.5mm; x2=46.0mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+
+                ha:attributes {
+                  subc-role=origin
+                }
+               }
+               ha:line.25957 {
+                x1=46.0mm; y1=19.5mm; x2=46.0mm; y2=20.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+
+                ha:attributes {
+                  subc-role=x
+                }
+               }
+               ha:line.25960 {
+                x1=46.0mm; y1=19.5mm; x2=45.0mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+
+                ha:attributes {
+                  subc-role=y
+                }
+               }
+               ha:line.25963 {
+                x1=45.1mm; y1=19.5mm; x2=45.1mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+
+                ha:attributes {
+                  subc-role=pnp-origin
+                }
+               }
+              }
+              ha:type {
+               top = 1
+               misc = 1
+               virtual = 1
+              }
+            }
+
+            ha:top-silkscreen {
+             lid=1
+             ha:combining {             }
+
+              li:objects {
+               ha:line.25966 {
+                x1=42.1mm; y1=12.9mm; x2=39.1mm; y2=15.9mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25969 {
+                x1=39.1mm; y1=15.9mm; x2=39.1mm; y2=23.1mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25972 {
+                x1=39.1mm; y1=23.1mm; x2=42.1mm; y2=26.1mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25975 {
+                x1=51.2mm; y1=12.8mm; x2=51.2mm; y2=26.2mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25978 {
+                x1=51.2mm; y1=26.2mm; x2=48.4mm; y2=26.2mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25981 {
+                x1=43.6mm; y1=26.2mm; x2=39.0mm; y2=26.2mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25984 {
+                x1=39.0mm; y1=26.2mm; x2=39.0mm; y2=12.8mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25987 {
+                x1=51.2mm; y1=12.8mm; x2=48.4mm; y2=12.8mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25990 {
+                x1=43.6mm; y1=12.8mm; x2=39.0mm; y2=12.8mm; thickness=0.2mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+              }
+              ha:type {
+               silk = 1
+               top = 1
+              }
+            }
+
+            ha:top-assembly {
+             lid=2
+             ha:combining {             }
+
+              li:objects {
+               ha:line.25993 {
+                x1=45.1mm; y1=18.8mm; x2=45.1mm; y2=20.2mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25996 {
+                x1=1.80314961in; y1=19.5mm; x2=44.4mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.25999 {
+                x1=51.1mm; y1=12.9mm; x2=51.1mm; y2=26.1mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.26002 {
+                x1=51.1mm; y1=26.1mm; x2=39.1mm; y2=26.1mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.26005 {
+                x1=39.1mm; y1=26.1mm; x2=39.1mm; y2=12.9mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:line.26008 {
+                x1=39.1mm; y1=12.9mm; x2=51.1mm; y2=12.9mm; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:arc.26011 {
+                x=45.1mm; y=19.5mm; width=0.5mm; height=0.5mm; astart=270.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
+                ha:flags {
+                 lock=1
+                }
+               }
+               ha:text.26012 {
+                string=%a.parent.refdes%; x=45.1mm; y=19.5mm; scale=100; fid=0;
+                ha:flags {
+                 dyntext=1
+                 floater=1
+                 lock=1
+                }
+                rot = 270.000000
+               }
+              }
+              ha:type {
+               top = 1
+               doc = 1
+              }
+              purpose = assy
+            }
+
+            ha:top-courtyard {
+             lid=3
+             ha:combining {             }
+
+              li:objects {
+               ha:polygon.26016 {
+                li:geometry {
+                  ta:contour {
+                   { 51.35mm; 9.75mm }
+                   { 51.35mm; 29.25mm }
+                   { 38.85mm; 29.25mm }
+                   { 38.85mm; 9.75mm }
+                  }
+                }
+
+                ha:flags {
+                 lock=1
+                }
+               }
+              }
+              ha:type {
+               top = 1
+               doc = 1
+              }
+              purpose = ko.courtyard
+            }
+           }
+          }
+           uid = AQV3WupyorPasUcZHO0AAAAZ
  ha:flags ={ lock=1
- };        }
-         ha:subc.25307 {
+ };          }
+         ha:subc.8328 {
           ha:attributes {
-           value=USB-C receptacle
-           footprint=CONNECTOR_XKB_U262-24XN-4BV60.lht
-           refdes=J2
+           value=
+           footprint=SOT95P237X112-3N.lht
+           refdes=Q2
           }
          ha:data {
                   li:padstack_prototypes {
@@ -7240,14 +8040,14 @@ ha:pcb-rnd-board-v8 {
                }
                clearance=0.2mm
                 li:ps_poly {
-                 -0.15mm  
-                 -0.45mm  
-                 0.15mm  
-                 -0.45mm  
-                 0.15mm  
-                 0.45mm  
-                 -0.15mm  
-                 0.45mm  
+                 -0.55mm  
+                 -0.3mm  
+                 0.55mm  
+                 -0.3mm  
+                 0.55mm  
+                 0.3mm  
+                 -0.55mm  
+                 0.3mm  
                 }
               }
 
@@ -7259,14 +8059,14 @@ ha:pcb-rnd-board-v8 {
                }
                clearance=0.0
                 li:ps_poly {
-                 -0.2mm  
-                 -0.5mm  
-                 0.2mm  
-                 -0.5mm  
-                 0.2mm  
-                 0.5mm  
-                 -0.2mm  
-                 0.5mm  
+                 -0.6mm  
+                 -0.35mm  
+                 0.6mm  
+                 -0.35mm  
+                 0.6mm  
+                 0.35mm  
+                 -0.6mm  
+                 0.35mm  
                 }
               }
 
@@ -7278,224 +8078,14 @@ ha:pcb-rnd-board-v8 {
                }
                clearance=0.0
                 li:ps_poly {
-                 -0.15mm  
-                 -0.45mm  
-                 0.15mm  
-                 -0.45mm  
-                 0.15mm  
-                 0.45mm  
-                 -0.15mm  
-                 0.45mm  
-                }
-              }
-            }
-          }
-
-          ha:ps_proto_v6.1 {
-            hdia=0.4mm; hplated=1; htop=0; hbottom=0;
-            li:shape {
-
-              ha:ps_shape_v4 {
-               ha:ps_circ { x=0.0; y=0.0; dia=0.7mm;               }
-               ha:combining {               }
-               ha:layer_mask {
-                copper = 1
-                top = 1
-               }
-               clearance=0.2mm
-              }
-
-              ha:ps_shape_v4 {
-               ha:ps_circ { x=0.0; y=0.0; dia=0.75mm;               }
-               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=0.7mm;               }
-               ha:combining {               }
-               ha:layer_mask {
-                copper = 1
-                intern = 1
-               }
-               clearance=0.2mm
-              }
-
-              ha:ps_shape_v4 {
-               ha:ps_circ { x=0.0; y=0.0; dia=0.7mm;               }
-               ha:combining {               }
-               ha:layer_mask {
-                bottom = 1
-                copper = 1
-               }
-               clearance=0.2mm
-              }
-
-              ha:ps_shape_v4 {
-               ha:ps_circ { x=0.0; y=0.0; dia=0.75mm;               }
-               ha:combining { sub=1; auto=1;               }
-               ha:layer_mask {
-                bottom = 1
-                mask = 1
-               }
-               clearance=0.0
-              }
-            }
-          }
-
-          ha:ps_proto_v6.2 {
-            hdia=0.0; hplated=1; htop=0; hbottom=0;
-            li:shape {
-
-              ha:ps_shape_v4 {
-               ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.5mm; square=0;               }
-               ha:combining { auto=1;               }
-               ha:layer_mask {
-                mech = 1
-               }
-               clearance=0.0
-              }
-
-              ha:ps_shape_v4 {
-               ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.9mm; square=0;               }
-               ha:combining {               }
-               ha:layer_mask {
-                copper = 1
-                top = 1
-               }
-               clearance=0.2mm
-              }
-
-              ha:ps_shape_v4 {
-               ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=1.0mm; square=0;               }
-               ha:combining { sub=1; auto=1;               }
-               ha:layer_mask {
-                top = 1
-                mask = 1
-               }
-               clearance=0.0
-              }
-
-              ha:ps_shape_v4 {
-               ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.9mm; square=0;               }
-               ha:combining {               }
-               ha:layer_mask {
-                copper = 1
-                intern = 1
-               }
-               clearance=0.2mm
-              }
-
-              ha:ps_shape_v4 {
-               ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=0.9mm; square=0;               }
-               ha:combining {               }
-               ha:layer_mask {
-                bottom = 1
-                copper = 1
-               }
-               clearance=0.2mm
-              }
-
-              ha:ps_shape_v4 {
-               ha:ps_line { x1=0.0; y1=-0.3mm; x2=0.0; y2=0.3mm; thickness=1.0mm; square=0;               }
-               ha:combining { sub=1; auto=1;               }
-               ha:layer_mask {
-                bottom = 1
-                mask = 1
-               }
-               clearance=0.0
-              }
-            }
-          }
-
-          ha:ps_proto_v6.3 {
-            hdia=0.65mm; hplated=0; htop=0; hbottom=0;
-            li:shape {
-
-              ha:ps_shape_v4 {
-               ha:ps_circ { x=0.0; y=0.0; dia=0.7mm;               }
-               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=0.7mm;               }
-               ha:combining { sub=1; auto=1;               }
-               ha:layer_mask {
-                bottom = 1
-                mask = 1
-               }
-               clearance=0.0
-              }
-            }
-          }
-
-          ha:ps_proto_v6.4 {
-            hdia=0.0; hplated=0; htop=0; hbottom=0;
-            li:shape {
-
-              ha:ps_shape_v4 {
-               ha:combining {               }
-               ha:layer_mask {
-                copper = 1
-                top = 1
-               }
-               clearance=0.2mm
-                li:ps_poly {
-                 -0.25mm  
-                 -0.15mm  
-                 0.25mm  
-                 -0.15mm  
-                 0.25mm  
-                 0.15mm  
-                 -0.25mm  
-                 0.15mm  
-                }
-              }
-
-              ha:ps_shape_v4 {
-               ha:combining { sub=1; auto=1;               }
-               ha:layer_mask {
-                top = 1
-                mask = 1
-               }
-               clearance=0.0
-                li:ps_poly {
+                 -0.55mm  
                  -0.3mm  
-                 -0.2mm  
-                 0.3mm  
-                 -0.2mm  
-                 0.3mm  
-                 0.2mm  
+                 0.55mm  
                  -0.3mm  
-                 0.2mm  
-                }
-              }
-
-              ha:ps_shape_v4 {
-               ha:combining { auto=1;               }
-               ha:layer_mask {
-                top = 1
-                paste = 1
-               }
-               clearance=0.0
-                li:ps_poly {
-                 -0.25mm  
-                 -0.15mm  
-                 0.25mm  
-                 -0.15mm  
-                 0.25mm  
-                 0.15mm  
-                 -0.25mm  
-                 0.15mm  
+                 0.55mm  
+                 0.3mm  
+                 -0.55mm  
+                 0.3mm  
                 }
               }
             }
@@ -7503,19 +8093,14 @@ ha:pcb-rnd-board-v8 {
          }
 
           li:objects {
-           ha:padstack_ref.25365 {
-            proto=0; x=23.06mm; y=23.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:padstack_ref.8385 {
+            proto=0; x=17.65mm; y=20.45mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
             ha:flags {
              clearline=1
              lock=1
             }
 
             li:thermal {
-              li:2 {
-               on  
-               sharp  
-               noshape  
-              }
             }
 
             ha:attributes {
@@ -7523,8 +8108,8 @@ ha:pcb-rnd-board-v8 {
               name=1
             }
            }
-           ha:padstack_ref.25366 {
-            proto=0; x=23.06mm; y=24.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:padstack_ref.8386 {
+            proto=0; x=17.65mm; y=18.55mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
             ha:flags {
              clearline=1
              lock=1
@@ -7538,8 +8123,8 @@ ha:pcb-rnd-board-v8 {
               name=2
             }
            }
-           ha:padstack_ref.25367 {
-            proto=0; x=23.06mm; y=24.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
+           ha:padstack_ref.8387 {
+            proto=0; x=15.35mm; y=19.5mm; rot=180.000000; xmirror=0; smirror=0; clearance=0.2mm;
             ha:flags {
              clearline=1
              lock=1
@@ -7553,527 +8138,6 @@ ha:pcb-rnd-board-v8 {
               name=3
             }
            }
-           ha:padstack_ref.25368 {
-            proto=0; x=23.06mm; y=25.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=4
-              name=4
-            }
-           }
-           ha:padstack_ref.25369 {
-            proto=0; x=23.06mm; y=25.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=5
-              name=5
-            }
-           }
-           ha:padstack_ref.25370 {
-            proto=0; x=23.06mm; y=26.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=6
-              name=6
-            }
-           }
-           ha:padstack_ref.25371 {
-            proto=0; x=23.06mm; y=26.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-              li:2 {
-               on  
-               sharp  
-               noshape  
-              }
-            }
-
-            ha:attributes {
-              term=7
-              name=7
-            }
-           }
-           ha:padstack_ref.25372 {
-            proto=0; x=23.06mm; y=27.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=8
-              name=8
-            }
-           }
-           ha:padstack_ref.25373 {
-            proto=0; x=23.06mm; y=27.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=9
-              name=9
-            }
-           }
-           ha:padstack_ref.25374 {
-            proto=0; x=23.06mm; y=28.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=10
-              name=10
-            }
-           }
-           ha:padstack_ref.25375 {
-            proto=0; x=23.06mm; y=28.75mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=11
-              name=11
-            }
-           }
-           ha:padstack_ref.25376 {
-            proto=0; x=23.06mm; y=29.25mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-              li:2 {
-               on  
-               sharp  
-               noshape  
-              }
-            }
-
-            ha:attributes {
-              term=12
-              name=12
-            }
-           }
-           ha:padstack_ref.25377 {
-            proto=1; x=21.85mm; y=23.625mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-              li:2 {
-               on  
-               round  
-               noshape  
-              }
-              li:3 {
-               on  
-               round  
-               noshape  
-              }
-            }
-
-            ha:attributes {
-              term=13
-              name=13
-            }
-           }
-           ha:padstack_ref.25378 {
-            proto=1; x=21.15mm; y=24.025mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=14
-              name=14
-            }
-           }
-           ha:padstack_ref.25379 {
-            proto=1; x=21.15mm; y=24.825mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=15
-              name=15
-            }
-           }
-           ha:padstack_ref.25380 {
-            proto=1; x=21.85mm; y=25.225mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=16
-              name=16
-            }
-           }
-           ha:padstack_ref.25381 {
-            proto=1; x=21.15mm; y=25.625mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=17
-              name=17
-            }
-           }
-           ha:padstack_ref.25382 {
-            proto=1; x=21.85mm; y=26.043mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-              li:2 {
-               on  
-               diag  
-               round  
-               noshape  
-              }
-            }
-
-            ha:attributes {
-              term=18
-              name=18
-            }
-           }
-           ha:padstack_ref.25383 {
-            proto=1; x=21.85mm; y=26.957mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=19
-              name=19
-            }
-           }
-           ha:padstack_ref.25384 {
-            proto=1; x=21.15mm; y=27.375mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=20
-              name=20
-            }
-           }
-           ha:padstack_ref.25385 {
-            proto=1; x=21.85mm; y=27.775mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=21
-              name=21
-            }
-           }
-           ha:padstack_ref.25386 {
-            proto=1; x=21.15mm; y=28.175mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=22
-              name=22
-            }
-           }
-           ha:padstack_ref.25387 {
-            proto=1; x=21.15mm; y=28.975mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=23
-              name=23
-            }
-           }
-           ha:padstack_ref.25388 {
-            proto=1; x=21.85mm; y=29.375mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-              li:2 {
-               on  
-               diag  
-               round  
-               noshape  
-              }
-              li:3 {
-               on  
-               diag  
-               round  
-               noshape  
-              }
-            }
-
-            ha:attributes {
-              term=24
-              name=24
-            }
-           }
-           ha:padstack_ref.25389 {
-            proto=2; x=21.25mm; y=22.295mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-              li:2 {
-               on  
-               diag  
-               round  
-               noshape  
-              }
-              li:3 {
-               on  
-               diag  
-               round  
-               noshape  
-              }
-            }
-
-            ha:attributes {
-              term=25
-              name=25
-            }
-           }
-           ha:padstack_ref.25390 {
-            proto=2; x=21.25mm; y=30.705mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-              li:2 {
-               on  
-               diag  
-               round  
-               noshape  
-              }
-              li:3 {
-               on  
-               diag  
-               round  
-               noshape  
-              }
-            }
-
-            ha:attributes {
-              term=26
-              name=26
-            }
-           }
-           ha:padstack_ref.25391 {
-            proto=2; x=16.86mm; y=21.935mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-              li:2 {
-               on  
-               diag  
-               round  
-               noshape  
-              }
-              li:3 {
-               on  
-               diag  
-               round  
-               noshape  
-              }
-            }
-
-            ha:attributes {
-              term=27
-              name=27
-            }
-           }
-           ha:padstack_ref.25392 {
-            proto=2; x=16.86mm; y=31.065mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-              li:2 {
-               on  
-               diag  
-               round  
-               noshape  
-              }
-              li:3 {
-               on  
-               diag  
-               round  
-               noshape  
-              }
-            }
-
-            ha:attributes {
-              term=28
-              name=28
-            }
-           }
-           ha:padstack_ref.25393 {
-            proto=3; x=22.5mm; y=22.825mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=MH1
-              name=MH1
-            }
-           }
-           ha:padstack_ref.25394 {
-            proto=3; x=22.5mm; y=30.175mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=MH2
-              name=MH2
-            }
-           }
-           ha:padstack_ref.25395 {
-            proto=4; x=24.05mm; y=23.055mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=29
-              name=29
-            }
-           }
-           ha:padstack_ref.25396 {
-            proto=4; x=24.05mm; y=29.945mm; rot=270.000000; xmirror=0; smirror=0; clearance=0.2mm;
-            ha:flags {
-             clearline=1
-             lock=1
-            }
-
-            li:thermal {
-            }
-
-            ha:attributes {
-              term=30
-              name=30
-            }
-           }
           }
           li:layers {
 
@@ -8082,50 +8146,34 @@ ha:pcb-rnd-board-v8 {
             ha:combining {            }
 
              li:objects {
-              ha:line.25308 {
-               x1=22.5mm; y1=26.5mm; x2=22.5mm; y2=26.5mm; thickness=0.1mm; clearance=0.0;
-               ha:flags {
-                selected=1
-                lock=1
-               }
-
+              ha:line.8329 {
+               x1=16.5mm; y1=19.5mm; x2=16.5mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
                ha:attributes {
                  subc-role=origin
                }
-              }
-              ha:line.25311 {
-               x1=22.5mm; y1=26.5mm; x2=22.5mm; y2=27.5mm; thickness=0.1mm; clearance=0.0;
-               ha:flags {
-                selected=1
-                lock=1
-               }
-
+ ha:flags ={ lock=1
+ };              }
+              ha:line.8332 {
+               x1=16.5mm; y1=19.5mm; x2=15.5mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
                ha:attributes {
                  subc-role=x
                }
-              }
-              ha:line.25314 {
-               x1=22.5mm; y1=26.5mm; x2=21.5mm; y2=26.5mm; thickness=0.1mm; clearance=0.0;
-               ha:flags {
-                selected=1
-                lock=1
-               }
-
+ ha:flags ={ lock=1
+ };              }
+              ha:line.8335 {
+               x1=16.5mm; y1=19.5mm; x2=16.5mm; y2=18.5mm; thickness=0.1mm; clearance=0.0;
                ha:attributes {
                  subc-role=y
                }
-              }
-              ha:line.25317 {
-               x1=19.33mm; y1=26.5mm; x2=19.33mm; y2=26.5mm; thickness=0.1mm; clearance=0.0;
-               ha:flags {
-                selected=1
-                lock=1
-               }
-
+ ha:flags ={ lock=1
+ };              }
+              ha:line.8338 {
+               x1=16.5mm; y1=19.5mm; x2=16.5mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
                ha:attributes {
                  subc-role=pnp-origin
                }
-              }
+ ha:flags ={ lock=1
+ };              }
              }
              ha:type {
               top = 1
@@ -8139,36 +8187,32 @@ ha:pcb-rnd-board-v8 {
             ha:combining {            }
 
              li:objects {
-              ha:line.25320 {
-               x1=24.43mm; y1=21.45mm; x2=24.43mm; y2=22.505mm; thickness=0.2mm; clearance=0.0;
+              ha:line.8341 {
+               x1=17.25mm; y1=21.06mm; x2=15.75mm; y2=21.06mm; thickness=0.2mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
-              ha:line.25323 {
-               x1=24.43mm; y1=23.605mm; x2=24.43mm; y2=29.395mm; thickness=0.2mm; clearance=0.0;
+              ha:line.8344 {
+               x1=15.75mm; y1=21.06mm; x2=15.75mm; y2=20.1mm; thickness=0.2mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
-              ha:line.25326 {
-               x1=24.43mm; y1=30.495mm; x2=24.43mm; y2=31.55mm; thickness=0.2mm; clearance=0.0;
+              ha:line.8347 {
+               x1=15.75mm; y1=18.9mm; x2=15.75mm; y2=17.94mm; thickness=0.2mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
-              ha:line.25329 {
-               x1=24.43mm; y1=31.55mm; x2=17.91mm; y2=31.55mm; thickness=0.2mm; clearance=0.0;
+              ha:line.8350 {
+               x1=15.75mm; y1=17.94mm; x2=17.25mm; y2=17.94mm; thickness=0.2mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
-              ha:line.25332 {
-               x1=15.81mm; y1=31.55mm; x2=14.23mm; y2=31.55mm; thickness=0.2mm; clearance=0.0;
+              ha:line.8353 {
+               x1=17.25mm; y1=19.85mm; x2=17.25mm; y2=19.15mm; thickness=0.2mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
-              ha:line.25335 {
-               x1=14.23mm; y1=31.55mm; x2=14.23mm; y2=21.45mm; thickness=0.2mm; clearance=0.0;
+              ha:line.8356 {
+               x1=17.25mm; y1=21.05mm; x2=18.5mm; y2=21.05mm; thickness=0.2mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
-              ha:line.25338 {
-               x1=24.43mm; y1=21.45mm; x2=17.91mm; y2=21.45mm; thickness=0.2mm; clearance=0.0;
- ha:flags ={ lock=1
- };              }
-              ha:line.25341 {
-               x1=15.81mm; y1=21.45mm; x2=14.23mm; y2=21.45mm; thickness=0.2mm; clearance=0.0;
+              ha:line.8359 {
+               x1=18.5mm; y1=21.05mm; x2=18.5mm; y2=20.15mm; thickness=0.2mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
              }
@@ -8183,42 +8227,46 @@ ha:pcb-rnd-board-v8 {
             ha:combining {            }
 
              li:objects {
-              ha:line.25345 {
-               x1=19.33mm; y1=25.8mm; x2=19.33mm; y2=27.2mm; thickness=0.1mm; clearance=0.0;
+              ha:line.8362 {
+               x1=17.2mm; y1=19.5mm; x2=15.8mm; y2=19.5mm; thickness=0.1mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
-              ha:line.25348 {
-               x1=20.03mm; y1=26.5mm; x2=18.63mm; y2=26.5mm; thickness=0.1mm; clearance=0.0;
+              ha:line.8365 {
+               x1=16.5mm; y1=20.2mm; x2=16.5mm; y2=18.8mm; thickness=0.1mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
-              ha:line.25351 {
-               x1=24.33mm; y1=21.55mm; x2=24.33mm; y2=31.45mm; thickness=0.1mm; clearance=0.0;
+              ha:line.8368 {
+               x1=16.5mm; y1=20.96mm; x2=15.85mm; y2=20.96mm; thickness=0.1mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
-              ha:line.25354 {
-               x1=24.33mm; y1=31.45mm; x2=14.33mm; y2=31.45mm; thickness=0.1mm; clearance=0.0;
+              ha:line.8371 {
+               x1=15.85mm; y1=20.96mm; x2=15.85mm; y2=18.04mm; thickness=0.1mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
-              ha:line.25357 {
-               x1=14.33mm; y1=31.45mm; x2=14.33mm; y2=21.55mm; thickness=0.1mm; clearance=0.0;
+              ha:line.8374 {
+               x1=15.85mm; y1=18.04mm; x2=17.15mm; y2=18.04mm; thickness=0.1mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
-              ha:line.25360 {
-               x1=14.33mm; y1=21.55mm; x2=24.33mm; y2=21.55mm; thickness=0.1mm; clearance=0.0;
+              ha:line.8377 {
+               x1=17.15mm; y1=18.04mm; x2=17.15mm; y2=20.31mm; thickness=0.1mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
-              ha:arc.25363 {
-               x=19.33mm; y=26.5mm; width=0.5mm; height=0.5mm; astart=270.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
+              ha:line.8380 {
+               x1=17.15mm; y1=20.31mm; x2=16.5mm; y2=20.96mm; thickness=0.1mm; clearance=0.0;
  ha:flags ={ lock=1
  };              }
-              ha:text.25344 {
-               string=%a.parent.refdes%; x=19.33mm; y=26.5mm; scale=100; fid=0;
+              ha:arc.8383 {
+               x=16.5mm; y=19.5mm; width=0.5mm; height=0.5mm; astart=180.000000; adelta=360.000000; thickness=0.1mm; clearance=0.0;
+ ha:flags ={ lock=1
+ };              }
+              ha:text.8384 {
+               string=%a.parent.refdes%; x=16.5mm; y=19.5mm; scale=100; fid=0;
                ha:flags {
                 dyntext=1
                 floater=1
                 lock=1
                }
-               rot = 270.000000
+               rot = 180.000000
               }
              }
              ha:type {
@@ -8233,16 +8281,23 @@ ha:pcb-rnd-board-v8 {
             ha:combining {            }
 
              li:objects {
-              ha:polygon.25397 {
+              ha:polygon.8388 {
                li:geometry {
                  ta:contour {
-                  { 24.58mm; 21.235mm }
-                  { 24.58mm; 31.765mm }
-                  { 14.08mm; 31.765mm }
-                  { 14.08mm; 21.235mm }
+                  { 18.45mm; 21.0mm }
+                  { 17.4mm; 21.0mm }
+                  { 17.4mm; 21.21mm }
+                  { 15.6mm; 21.21mm }
+                  { 15.6mm; 20.05mm }
+                  { 14.55mm; 20.05mm }
+                  { 14.55mm; 18.95mm }
+                  { 15.6mm; 18.95mm }
+                  { 15.6mm; 17.79mm }
+                  { 17.4mm; 17.79mm }
+                  { 17.4mm; 18.0mm }
+                  { 18.45mm; 18.0mm }
                  }
                }
-
  ha:flags ={ lock=1
  };              }
              }
@@ -8254,7 +8309,7 @@ ha:pcb-rnd-board-v8 {
            }
           }
          }
-          uid = AQV3WupyorPasUcZHO0AAAAd
+          uid = fNBhogi9RvPCwmAkAQYAAAAf
  ha:flags ={ lock=1
  };         }
    }
@@ -8289,30 +8344,6 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.16063 {
-        x1=24.9mm; y1=8.7mm; x2=24.9mm; y2=9.3mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.16066 {
-        x1=24.9mm; y1=9.3mm; x2=25.1mm; y2=9.5mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.16069 {
-        x1=25.1mm; y1=9.5mm; x2=28.9mm; y2=9.5mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.16072 {
-        x1=28.9mm; y1=9.5mm; x2=30.4mm; y2=11.0mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.18092 {
         x1=28.6mm; y1=14.0mm; x2=27.2mm; y2=14.0mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
@@ -8409,12 +8440,6 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.19304 {
-        x1=24.495mm; y1=8.295mm; x2=24.9mm; y2=8.7mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.19981 {
         x1=28.6mm; y1=17.0mm; x2=27.2mm; y2=17.0mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
@@ -8463,36 +8488,6 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.21955 {
-        x1=23.5mm; y1=18.8mm; x2=24.6mm; y2=18.8mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22057 {
-        x1=20.4mm; y1=17.6mm; x2=20.0mm; y2=17.2mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22060 {
-        x1=20.0mm; y1=17.2mm; x2=20.0mm; y2=13.8mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22066 {
-        x1=21.15mm; y1=13.375mm; x2=20.425mm; y2=13.375mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22069 {
-        x1=20.0mm; y1=13.8mm; x2=20.425mm; y2=13.375mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.22162 {
         x1=23.06mm; y1=25.75mm; x2=24.45mm; y2=25.75mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
@@ -8517,72 +8512,12 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.22483 {
-        x1=30.0mm; y1=21.3mm; x2=31.3mm; y2=21.3mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22657 {
-        x1=25.1mm; y1=19.5mm; x2=26.0mm; y2=20.4mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22660 {
-        x1=26.0mm; y1=20.4mm; x2=28.4mm; y2=20.4mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22663 {
-        x1=28.4mm; y1=20.4mm; x2=28.7mm; y2=20.7mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22666 {
-        x1=28.7mm; y1=20.7mm; x2=28.7mm; y2=22.0mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22669 {
-        x1=28.7mm; y1=22.0mm; x2=29.0mm; y2=22.3mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22761 {
-        x1=30.0mm; y1=25.0mm; x2=30.0mm; y2=26.1mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.22764 {
         x1=30.0mm; y1=26.1mm; x2=27.5mm; y2=26.1mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.22917 {
-        x1=23.06mm; y1=27.25mm; x2=25.35mm; y2=27.25mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22920 {
-        x1=25.35mm; y1=27.25mm; x2=26.0mm; y2=27.9mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22923 {
-        x1=30.0mm; y1=27.9mm; x2=26.0mm; y2=27.9mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.23061 {
         x1=23.06mm; y1=24.25mm; x2=24.55mm; y2=24.25mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
@@ -8667,24 +8602,6 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.23169 {
-        x1=21.15mm; y1=25.625mm; x2=19.925mm; y2=25.625mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.23172 {
-        x1=19.925mm; y1=25.625mm; x2=19.5mm; y2=25.2mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.23175 {
-        x1=19.5mm; y1=25.2mm; x2=19.5mm; y2=20.2mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.23235 {
         x1=21.15mm; y1=24.825mm; x2=21.15mm; y2=24.025mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
@@ -8781,80 +8698,212 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.25527 {
-        x1=26.5mm; y1=31.1mm; x2=1000.0mil; y2=31.1mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26094 {
+        x1=25.3mm; y1=18.3mm; x2=25.0mm; y2=18.0mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25539 {
-        x1=49.8mm; y1=30.75mm; x2=45.35mm; y2=30.75mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26212 {
+        x1=23.6mm; y1=19.0mm; x2=23.6mm; y2=18.0mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25542 {
-        x1=45.35mm; y1=30.75mm; x2=45.2mm; y2=30.9mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26260 {
+        x1=25.3mm; y1=18.3mm; x2=25.3mm; y2=19.4mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25668 {
-        x1=50.75mm; y1=28.45mm; x2=50.55mm; y2=28.45mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26263 {
+        x1=25.3mm; y1=19.4mm; x2=25.0mm; y2=19.7mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25671 {
-        x1=50.55mm; y1=28.45mm; x2=49.9mm; y2=27.8mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26269 {
+        x1=21.75mm; y1=20.45mm; x2=21.75mm; y2=19.95mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25674 {
-        x1=47.25mm; y1=28.45mm; x2=47.15mm; y2=28.45mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26272 {
+        x1=21.75mm; y1=19.95mm; x2=22.0mm; y2=19.7mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25677 {
-        x1=47.15mm; y1=28.45mm; x2=46.5mm; y2=27.8mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26275 {
+        x1=25.0mm; y1=19.7mm; x2=22.0mm; y2=19.7mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.22654 {
-        x1=20.0mm; y1=19.5mm; x2=25.1mm; y2=19.5mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26558 {
+        x1=26.5mm; y1=31.1mm; x2=22.6mm; y2=31.1mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.22651 {
-        x1=19.5mm; y1=19.0mm; x2=20.0mm; y2=19.5mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26561 {
+        x1=22.6mm; y1=31.1mm; x2=22.2mm; y2=31.5mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.22648 {
-        x1=19.5mm; y1=18.8mm; x2=19.5mm; y2=19.0mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26564 {
+        x1=22.2mm; y1=31.5mm; x2=20.3mm; y2=31.5mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.22054 {
-        x1=21.1mm; y1=17.6mm; x2=20.4mm; y2=17.6mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26576 {
+        x1=20.1mm; y1=20.7mm; x2=20.1mm; y2=20.2mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.22051 {
-        x1=21.5mm; y1=18.0mm; x2=21.1mm; y2=17.6mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26579 {
+        x1=20.1mm; y1=20.2mm; x2=19.4mm; y2=19.5mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.22048 {
-        x1=21.5mm; y1=18.8mm; x2=21.5mm; y2=18.0mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26606 {
+        x1=23.06mm; y1=27.25mm; x2=26.85mm; y2=27.25mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26609 {
+        x1=26.85mm; y1=27.25mm; x2=27.5mm; y2=27.9mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26612 {
+        x1=27.5mm; y1=27.9mm; x2=30.0mm; y2=27.9mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26650 {
+        x1=1000.0mil; y1=27.9mm; x2=1000.0mil; y2=28.4mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26653 {
+        x1=1000.0mil; y1=28.4mm; x2=25.0mm; y2=28.8mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26680 {
+        x1=1000.0mil; y1=26.5mm; x2=27.1mm; y2=26.5mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26683 {
+        x1=27.1mm; y1=26.5mm; x2=27.5mm; y2=26.1mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26770 {
+        x1=21.15mm; y1=25.625mm; x2=19.875mm; y2=25.625mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26773 {
+        x1=19.875mm; y1=25.625mm; x2=19.5mm; y2=26.0mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26776 {
+        x1=19.5mm; y1=26.0mm; x2=19.5mm; y2=28.6mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26779 {
+        x1=19.5mm; y1=28.6mm; x2=20.3mm; y2=29.4mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26782 {
+        x1=20.3mm; y1=31.5mm; x2=19.1mm; y2=30.3mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26785 {
+        x1=19.1mm; y1=30.3mm; x2=19.1mm; y2=21.7mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26788 {
+        x1=20.1mm; y1=20.7mm; x2=19.1mm; y2=21.7mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27170 {
+        x1=15.35mm; y1=19.5mm; x2=19.45mm; y2=19.5mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27176 {
+        x1=17.65mm; y1=20.45mm; x2=19.15mm; y2=20.45mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27179 {
+        x1=19.15mm; y1=20.45mm; x2=19.2mm; y2=20.5mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27192 {
+        x1=30.0mm; y1=21.3mm; x2=29.7mm; y2=21.3mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27195 {
+        x1=29.7mm; y1=21.3mm; x2=28.8mm; y2=22.2mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27220 {
+        x1=30.4mm; y1=11.0mm; x2=30.4mm; y2=11.4mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27223 {
+        x1=30.4mm; y1=11.4mm; x2=29.6mm; y2=12.2mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27234 {
+        x1=25.1mm; y1=9.7mm; x2=25.1mm; y2=8.9mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27237 {
+        x1=24.495mm; y1=8.295mm; x2=25.1mm; y2=8.9mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
@@ -8922,24 +8971,6 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.22375 {
-        x1=20.1mm; y1=21.7mm; x2=20.8mm; y2=21.0mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22378 {
-        x1=20.8mm; y1=21.0mm; x2=31.0mm; y2=21.0mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22381 {
-        x1=31.0mm; y1=21.0mm; x2=31.3mm; y2=21.3mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.22384 {
         x1=24.5mm; y1=25.7mm; x2=24.5mm; y2=22.5mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
@@ -8958,18 +8989,6 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.22674 {
-        x1=30.0mm; y1=25.0mm; x2=30.0mm; y2=23.3mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.22677 {
-        x1=30.0mm; y1=23.3mm; x2=29.0mm; y2=22.3mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.23869 {
         x1=21.85mm; y1=12.043mm; x2=23.743mm; y2=12.043mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
@@ -8994,18 +9013,6 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.24096 {
-        x1=27.5mm; y1=11.0mm; x2=29.3mm; y2=11.0mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.24099 {
-        x1=31.0mm; y1=500.0mil; x2=29.3mm; y2=11.0mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.24249 {
         x1=23.4mm; y1=10.5mm; x2=24.9mm; y2=12.0mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
@@ -9036,60 +9043,6 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.24970 {
-        x1=20.475mm; y1=27.375mm; x2=20.1mm; y2=27.0mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.24973 {
-        x1=20.1mm; y1=21.7mm; x2=20.1mm; y2=27.0mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.25044 {
-        x1=21.5mm; y1=18.0mm; x2=22.6mm; y2=18.0mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.25047 {
-        x1=22.6mm; y1=18.0mm; x2=24.1mm; y2=19.5mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.25056 {
-        x1=31.0mm; y1=500.0mil; x2=31.0mm; y2=18.8mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.25085 {
-        x1=24.1mm; y1=19.5mm; x2=40.2mm; y2=19.5mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.25106 {
-        x1=24.6mm; y1=18.8mm; x2=40.1mm; y2=18.8mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.25136 {
-        x1=40.2mm; y1=19.5mm; x2=41.0mm; y2=20.3mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.25148 {
-        x1=41.5mm; y1=20.2mm; x2=40.1mm; y2=18.8mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.25184 {
         x1=21.15mm; y1=10.825mm; x2=21.375mm; y2=10.825mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
@@ -9108,74 +9061,182 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.25530 {
-        x1=1000.0mil; y1=31.1mm; x2=45.0mm; y2=31.1mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26028 {
+        x1=25.0mm; y1=18.0mm; x2=25.9mm; y2=18.9mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25533 {
-        x1=45.0mm; y1=31.1mm; x2=45.2mm; y2=30.9mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26031 {
+        x1=25.9mm; y1=18.9mm; x2=30.4mm; y2=18.9mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25638 {
-        x1=49.9mm; y1=27.8mm; x2=49.9mm; y2=1.0511811in; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26034 {
+        x1=30.4mm; y1=18.9mm; x2=31.0mm; y2=18.3mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25641 {
-        x1=49.9mm; y1=1.0511811in; x2=49.6mm; y2=26.4mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26146 {
+        x1=21.15mm; y1=13.375mm; x2=20.425mm; y2=13.375mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25644 {
-        x1=49.6mm; y1=26.4mm; x2=41.8mm; y2=26.4mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26149 {
+        x1=20.425mm; y1=13.375mm; x2=19.9mm; y2=13.9mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25647 {
-        x1=41.8mm; y1=26.4mm; x2=41.5mm; y2=26.1mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26161 {
+        x1=23.2mm; y1=17.6mm; x2=23.6mm; y2=18.0mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25653 {
-        x1=46.5mm; y1=27.8mm; x2=46.5mm; y2=27.2mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26531 {
+        x1=19.2mm; y1=20.5mm; x2=19.2mm; y2=18.3mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25656 {
-        x1=46.5mm; y1=27.2mm; x2=46.2mm; y2=26.9mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26534 {
+        x1=19.2mm; y1=18.3mm; x2=19.9mm; y2=17.6mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25659 {
-        x1=46.2mm; y1=26.9mm; x2=41.4mm; y2=26.9mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26537 {
+        x1=23.2mm; y1=17.6mm; x2=19.9mm; y2=17.6mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25662 {
-        x1=41.4mm; y1=26.9mm; x2=41.0mm; y2=26.5mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26540 {
+        x1=19.9mm; y1=13.9mm; x2=19.9mm; y2=17.6mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25665 {
-        x1=41.0mm; y1=20.3mm; x2=41.0mm; y2=26.5mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26626 {
+        x1=20.3mm; y1=29.4mm; x2=19.7mm; y2=30.0mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25707 {
-        x1=41.5mm; y1=20.2mm; x2=41.5mm; y2=26.1mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26629 {
+        x1=19.7mm; y1=30.0mm; x2=19.7mm; y2=30.9mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26632 {
+        x1=19.7mm; y1=30.9mm; x2=20.3mm; y2=31.5mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26635 {
+        x1=20.3mm; y1=31.5mm; x2=22.2mm; y2=31.5mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26638 {
+        x1=22.2mm; y1=31.5mm; x2=22.6mm; y2=31.1mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26641 {
+        x1=22.6mm; y1=31.1mm; x2=24.7mm; y2=31.1mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26644 {
+        x1=24.7mm; y1=31.1mm; x2=25.0mm; y2=30.8mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26647 {
+        x1=25.0mm; y1=30.8mm; x2=25.0mm; y2=28.8mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26728 {
+        x1=20.475mm; y1=27.375mm; x2=19.8mm; y2=1.0511811in; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26731 {
+        x1=19.8mm; y1=1.0511811in; x2=19.8mm; y2=22.0mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26734 {
+        x1=20.8mm; y1=21.0mm; x2=19.8mm; y2=22.0mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27183 {
+        x1=28.8mm; y1=22.2mm; x2=28.8mm; y2=21.4mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27186 {
+        x1=28.8mm; y1=21.4mm; x2=28.4mm; y2=21.0mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27189 {
+        x1=28.4mm; y1=21.0mm; x2=20.8mm; y2=21.0mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27210 {
+        x1=27.5mm; y1=11.0mm; x2=27.5mm; y2=13.6mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27213 {
+        x1=27.5mm; y1=13.6mm; x2=31.0mm; y2=17.1mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27216 {
+        x1=31.0mm; y1=17.1mm; x2=31.0mm; y2=18.3mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27226 {
+        x1=29.6mm; y1=12.2mm; x2=29.6mm; y2=10.7mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27240 {
+        x1=25.1mm; y1=9.7mm; x2=28.6mm; y2=9.7mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27243 {
+        x1=28.6mm; y1=9.7mm; x2=29.6mm; y2=10.7mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
@@ -9190,12 +9251,24 @@ ha:pcb-rnd-board-v8 {
      ha:combining {     }
 
       li:objects {
+       ha:line.26955 {
+        x1=23.06mm; y1=26.75mm; x2=22.557mm; y2=26.75mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.26958 {
+        x1=22.557mm; y1=26.75mm; x2=21.85mm; y2=26.043mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
        ha:polygon.12549 { clearance=0.4mm;
         li:geometry {
           ta:contour {
            { 14.7mm; 7.2mm }
-           { 53.3mm; 7.2mm }
-           { 53.3mm; 31.8mm }
+           { 51.0mm; 7.2mm }
+           { 51.0mm; 31.8mm }
            { 14.7mm; 31.8mm }
           }
         }
@@ -9230,12 +9303,26 @@ ha:pcb-rnd-board-v8 {
      ha:combining {     }
 
       li:objects {
-       ha:polygon.12554 { clearance=0.4mm;
+       ha:polygon.26875 { clearance=0.4mm;
+        li:geometry {
+          ta:contour {
+           { 19.8mm; 21.0mm }
+           { 26.4mm; 21.0mm }
+           { 26.4mm; 27.4mm }
+           { 19.8mm; 27.4mm }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.26713 { clearance=0.4mm;
         li:geometry {
           ta:contour {
            { 14.7mm; 7.2mm }
-           { 53.3mm; 7.2mm }
-           { 53.3mm; 31.8mm }
+           { 51.0mm; 7.2mm }
+           { 51.0mm; 31.8mm }
            { 14.7mm; 31.8mm }
           }
         }
@@ -9245,20 +9332,6 @@ ha:pcb-rnd-board-v8 {
          lock=1
         }
        }
-       ha:polygon.24962 { clearance=0.4mm;
-        li:geometry {
-          ta:contour {
-           { 19.8mm; 20.9mm }
-           { 25.3mm; 20.9mm }
-           { 25.3mm; 27.9mm }
-           { 19.8mm; 27.9mm }
-          }
-        }
-
-        ha:flags {
-         clearpoly=1
-        }
-       }
       }
       color = {#6164ff}
     }
@@ -9276,19 +9349,19 @@ ha:pcb-rnd-board-v8 {
         }
        }
        ha:line.12385 {
-        x1=14.5mm; y1=32.0mm; x2=53.5mm; y2=32.0mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.12394 {
-        x1=53.5mm; y1=32.0mm; x2=53.5mm; y2=7.0mm; thickness=0.2mm; clearance=0.4mm;
+        x1=14.5mm; y1=32.0mm; x2=51.2mm; y2=32.0mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
        ha:line.12397 {
-        x1=53.5mm; y1=7.0mm; x2=14.5mm; y2=7.0mm; thickness=0.2mm; clearance=0.4mm;
+        x1=51.2mm; y1=7.0mm; x2=14.5mm; y2=7.0mm; thickness=0.2mm; clearance=0.4mm;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.25948 {
+        x1=51.2mm; y1=32.0mm; x2=51.2mm; y2=7.0mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
@@ -9351,13 +9424,6 @@ ha:pcb-rnd-board-v8 {
         }
         rot = 0.000000
        }
-       ha:text.10475 {
-        string=SBU; x=31.8mm; y=26.1mm; scale=150; fid=0;
-        ha:flags {
-         clearline=1
-        }
-        rot = 0.000000
-       }
        ha:text.11309 {
         string=Super; x=31.8mm; y=21.4mm; scale=150; fid=0;
         ha:flags {
@@ -9372,22 +9438,29 @@ ha:pcb-rnd-board-v8 {
         }
         rot = 0.000000
        }
-       ha:text.12381 {
-        string=eMarker~5A; x=31.8mm; y=29.0mm; scale=150; fid=0;
-        ha:flags {
-         clearline=1
-        }
-        rot = 0.000000
-       }
-       ha:text.12403 {
-        string=CR1220; x=51.5mm; y=30.0mm; scale=100; fid=0;
+       ha:text.25951 {
+        string=CR1220; x=49.1mm; y=31.4mm; scale=100; fid=0;
         ha:flags {
          clearline=1
         }
         rot = 90.000000
        }
-       ha:text.11299 {
-        string=USB-C cable tester; x=25.5mm; y=7.1mm; scale=150; fid=0;
+       ha:text.10475 {
+        string=SBU; x=31.8mm; y=26.1mm; scale=150; fid=0;
+        ha:flags {
+         clearline=1
+        }
+        rot = 0.000000
+       }
+       ha:text.12381 {
+        string=eMarker~5A; x=31.8mm; y=29.3mm; scale=150; fid=0;
+        ha:flags {
+         clearline=1
+        }
+        rot = 0.000000
+       }
+       ha:text.25869 {
+        string=USB-C cable tester; x=25.6mm; y=7.1mm; scale=175; fid=0;
         ha:flags {
          clearline=1
         }
@@ -9609,18 +9682,6 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.24796 {
-        x1=23.06mm; y1=26.25mm; x2=22.55mm; y2=26.25mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.24799 {
-        x1=21.85mm; y1=26.95mm; x2=22.55mm; y2=26.25mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.24826 {
         x1=23.06mm; y1=27.75mm; x2=21.875mm; y2=27.75mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
@@ -9669,92 +9730,92 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.24982 {
-        x1=23.3mm; y1=22.5mm; x2=23.3mm; y2=21.3mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26320 {
+        x1=23.3mm; y1=22.5mm; x2=23.3mm; y2=20.7mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.24985 {
-        x1=23.3mm; y1=21.3mm; x2=23.5mm; y2=21.1mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26323 {
+        x1=23.3mm; y1=20.7mm; x2=23.6mm; y2=20.4mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25453 {
-        x1=48.05mm; y1=24.6mm; x2=48.85mm; y2=1000.0mil; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26326 {
+        x1=23.6mm; y1=20.4mm; x2=25.3mm; y2=20.4mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25560 {
-        x1=48.45mm; y1=25.1mm; x2=48.5mm; y2=25.05mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26371 {
+        x1=48.8mm; y1=12.0mm; x2=46.05mm; y2=12.0mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25611 {
-        x1=51.2mm; y1=25.1mm; x2=48.55mm; y2=25.1mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26374 {
+        x1=46.05mm; y1=12.0mm; x2=46.0mm; y2=11.95mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25614 {
-        x1=51.2mm; y1=10.0mm; x2=48.55mm; y2=10.0mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26485 {
+        x1=23.3mm; y1=21.4mm; x2=21.4mm; y2=21.4mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25617 {
-        x1=48.45mm; y1=9.9mm; x2=48.55mm; y2=10.0mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26488 {
+        x1=21.4mm; y1=21.4mm; x2=20.7mm; y2=20.7mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25683 {
-        x1=48.85mm; y1=1000.0mil; x2=48.85mm; y2=29.25mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26497 {
+        x1=20.7mm; y1=20.7mm; x2=20.7mm; y2=18.55mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25686 {
-        x1=48.85mm; y1=29.25mm; x2=48.5mm; y2=29.6mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26892 {
+        x1=23.85mm; y1=26.25mm; x2=24.1mm; y2=26.5mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25695 {
-        x1=45.35mm; y1=28.45mm; x2=45.35mm; y2=29.25mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26901 {
+        x1=23.06mm; y1=26.25mm; x2=23.85mm; y2=26.25mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25698 {
-        x1=45.35mm; y1=29.25mm; x2=45.7mm; y2=29.6mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26980 {
+        x1=19.9mm; y1=8.1mm; x2=19.9mm; y2=13.2mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25701 {
-        x1=45.7mm; y1=29.6mm; x2=48.5mm; y2=29.6mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26983 {
+        x1=19.9mm; y1=13.2mm; x2=19.2mm; y2=13.9mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25704 {
-        x1=48.5mm; y1=29.6mm; x2=48.55mm; y2=29.55mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26986 {
+        x1=19.2mm; y1=13.9mm; x2=19.2mm; y2=17.3mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.24941 {
-        x1=23.5mm; y1=20.2mm; x2=23.5mm; y2=21.1mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26990 {
+        x1=19.2mm; y1=17.4mm; x2=19.2mm; y2=18.55mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25009 {
-        x1=21.5mm; y1=20.2mm; x2=23.5mm; y2=20.2mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.27161 {
+        x1=21.75mm; y1=18.55mm; x2=17.65mm; y2=18.55mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
@@ -9769,12 +9830,6 @@ ha:pcb-rnd-board-v8 {
      ha:combining {     }
 
       li:objects {
-       ha:line.19310 {
-        x1=24.5mm; y1=8.3mm; x2=25.0mm; y2=7.8mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
        ha:line.19316 {
         x1=24.5mm; y1=8.3mm; x2=24.495mm; y2=8.295mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
@@ -9799,92 +9854,74 @@ ha:pcb-rnd-board-v8 {
          clearline=1
         }
        }
-       ha:line.24201 {
-        x1=24.5mm; y1=10.3mm; x2=24.5mm; y2=8.3mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26834 {
+        x1=24.1mm; y1=26.5mm; x2=23.8mm; y2=26.2mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.24895 {
-        x1=21.85mm; y1=26.957mm; x2=22.353mm; y2=26.957mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26837 {
+        x1=23.8mm; y1=26.2mm; x2=23.8mm; y2=23.0mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.24898 {
-        x1=22.353mm; y1=26.957mm; x2=23.06mm; y2=26.25mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26840 {
+        x1=23.8mm; y1=23.0mm; x2=23.3mm; y2=22.5mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.24976 {
-        x1=23.3mm; y1=22.5mm; x2=23.3mm; y2=23.775mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26855 {
+        x1=21.85mm; y1=25.225mm; x2=23.775mm; y2=25.225mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.24988 {
-        x1=23.06mm; y1=26.25mm; x2=23.06mm; y2=24.015mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26858 {
+        x1=23.775mm; y1=25.225mm; x2=23.8mm; y2=25.2mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.24991 {
-        x1=23.06mm; y1=24.015mm; x2=23.3mm; y2=23.775mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26937 {
+        x1=21.85mm; y1=26.957mm; x2=23.643mm; y2=26.957mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.24994 {
-        x1=21.85mm; y1=25.225mm; x2=23.035mm; y2=25.225mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26940 {
+        x1=23.643mm; y1=26.957mm; x2=24.1mm; y2=26.5mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.24997 {
-        x1=23.035mm; y1=25.225mm; x2=23.06mm; y2=25.2mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26967 {
+        x1=48.8mm; y1=8.3mm; x2=47.9mm; y2=7.4mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25590 {
-        x1=50.7mm; y1=29.6mm; x2=33.225mm; y2=29.6mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26970 {
+        x1=24.5mm; y1=10.3mm; x2=24.5mm; y2=7.4mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25593 {
-        x1=33.225mm; y1=29.6mm; x2=31.4mm; y2=27.775mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26973 {
+        x1=47.9mm; y1=7.4mm; x2=20.6mm; y2=7.4mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25596 {
-        x1=21.85mm; y1=27.775mm; x2=31.4mm; y2=27.775mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26976 {
+        x1=20.6mm; y1=7.4mm; x2=19.9mm; y2=8.1mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
        }
-       ha:line.25620 {
-        x1=25.0mm; y1=7.8mm; x2=50.2mm; y2=7.8mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.25623 {
-        x1=50.2mm; y1=7.8mm; x2=51.2mm; y2=8.8mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.25632 {
-        x1=51.2mm; y1=8.8mm; x2=51.2mm; y2=29.1mm; thickness=0.2mm; clearance=0.4mm;
-        ha:flags {
-         clearline=1
-        }
-       }
-       ha:line.25635 {
-        x1=51.2mm; y1=29.1mm; x2=50.7mm; y2=29.6mm; thickness=0.2mm; clearance=0.4mm;
+       ha:line.26993 {
+        x1=48.8mm; y1=12.0mm; x2=48.8mm; y2=8.3mm; thickness=0.2mm; clearance=0.4mm;
         ha:flags {
          clearline=1
         }
@@ -10097,17 +10134,17 @@ ha:pcb-rnd-board-v8 {
     ha:unnamed_net17 {
     li:conn { D8-2; R8-2;    }
     }
-    ha:unnamed_net18 {
+     ha:unnamed_net20 {
+     li:conn { D1-2; R1-2;     }
+     }
+    ha:unnamed_net19 {
     li:conn { D2-2; R2-2;    }
     }
-    ha:unnamed_net19 {
-    li:conn { D1-2; R1-2;    }
-    }
-     ha:unnamed_net20 {
-     li:conn { D3-2; R3-2;     }
-     }
+      ha:unnamed_net22 {
+      li:conn { D5-2; R5-2;      }
+      }
      ha:unnamed_net21 {
-     li:conn { D5-2; R5-2;     }
+     li:conn { D3-2; R3-2;     }
      }
     ha:GND {
     li:conn { B1-3; D6-1; D7-1; D8-1; J1-17; J1-22; J2-1; J2-7; J2-12; J2-13; J2-18; J2-24; J2-25; J2-26; J2-27; J2-28;    }
@@ -10146,7 +10183,7 @@ ha:pcb-rnd-board-v8 {
      li:conn { J1-10; J1-23;     }
      }
     ha:VCC {
-    li:conn { B1-1; B1-2; J1-2; J1-8; J2-4; J2-6; J2-9; J2-16; J2-19; J2-21; Q1-2; Q2-2; R2-1; R6-2; R7-2;    }
+    li:conn { B1-1; J1-2; J1-8; J2-4; J2-6; J2-9; J2-16; J2-19; J2-21; Q1-2; Q2-2; R2-1; R6-2; R7-2;    }
     }
     ha:Dn {
     li:conn { D3-1; J1-7; J1-18;    }