diff --git a/demos/stickhub/StickHub.kicad_pcb b/demos/stickhub/StickHub.kicad_pcb
index ec78856f9c..a56e8a1b4b 100644
--- a/demos/stickhub/StickHub.kicad_pcb
+++ b/demos/stickhub/StickHub.kicad_pcb
@@ -1,4 +1,4 @@
-(kicad_pcb (version 20210722) (generator pcbnew)
+(kicad_pcb (version 20210824) (generator pcbnew)
 
   (general
     (thickness 1.6)
@@ -4881,6 +4881,10 @@
     (fp_line (start -1.25 -1) (end -1.25 1) (layer "B.Fab") (width 0.05) (tstamp 63adfcbe-068b-4804-8874-228eb4042fe0))
     (fp_line (start 1.25 1) (end 1.25 -1) (layer "B.Fab") (width 0.05) (tstamp 896c7761-f268-4264-8444-51733bbd93b2))
     (fp_line (start 1.25 -1) (end -1.25 -1) (layer "B.Fab") (width 0.05) (tstamp e8ac38ae-7e15-44ac-b3d4-92b2ab76edca))
+    (pad "" smd roundrect locked (at 0.85 -0.7 225) (size 1 1) (layers "B.Paste") (roundrect_rratio 0.33) (tstamp 2731e72d-a6ac-46dd-a537-a0d136823566))
+    (pad "" smd roundrect locked (at -0.85 0.7 225) (size 1 1) (layers "B.Paste") (roundrect_rratio 0.33) (tstamp 5853f021-ca21-4ce9-8b96-36c1a46ef2af))
+    (pad "" smd roundrect locked (at 0.85 0.7 225) (size 1 1) (layers "B.Paste") (roundrect_rratio 0.33) (tstamp 5cb0d316-69a9-4e69-a42f-5d27bbb912c2))
+    (pad "" smd roundrect locked (at -0.85 -0.7 225) (size 1 1) (layers "B.Paste") (roundrect_rratio 0.33) (tstamp d6ecef4b-6f6b-403b-996b-46b4c2219301))
     (pad "1" smd roundrect locked (at -0.85 -0.7 225) (size 1.2 1.1) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.1)
       (net 44 "/XI") (pintype "passive") (tstamp 4ff3c9b9-bf69-4033-be37-79368071c8dc))
     (pad "2" smd roundrect locked (at 0.85 -0.7 225) (size 1.2 1.1) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.1)
@@ -4889,10 +4893,6 @@
       (net 43 "/XO") (pintype "passive") (tstamp 55728680-ed42-4601-9c57-2c487f5f4110))
     (pad "4" smd roundrect locked (at -0.85 0.7 225) (size 1.2 1.1) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.1)
       (net 1 "GND") (pinfunction "GND") (pintype "passive") (tstamp 6e3a5d52-a6ca-4070-aa30-60d8e529c7fb))
-    (pad "5" smd roundrect locked (at -0.85 0.7 225) (size 1 1) (layers "B.Paste") (roundrect_rratio 0.33) (tstamp 5853f021-ca21-4ce9-8b96-36c1a46ef2af))
-    (pad "6" smd roundrect locked (at 0.85 0.7 225) (size 1 1) (layers "B.Paste") (roundrect_rratio 0.33) (tstamp 5cb0d316-69a9-4e69-a42f-5d27bbb912c2))
-    (pad "7" smd roundrect locked (at 0.85 -0.7 225) (size 1 1) (layers "B.Paste") (roundrect_rratio 0.33) (tstamp 2731e72d-a6ac-46dd-a537-a0d136823566))
-    (pad "8" smd roundrect locked (at -0.85 -0.7 225) (size 1 1) (layers "B.Paste") (roundrect_rratio 0.33) (tstamp d6ecef4b-6f6b-403b-996b-46b4c2219301))
     (model "${KIPRJMOD}/3dmodels/Crystal_SMD_4P_2520.step"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7562,41 +7562,47 @@
   (arc (start 154.0916 103.027996) (mid 153.976795 103.00516) (end 153.879468 102.940128) (width 0.25) (layer "B.Cu") (net 4) (tstamp e6c81ccf-30f9-4b71-8281-300bef550fb2))
   (arc (start 155.554382 95.920491) (mid 155.36304 95.958551) (end 155.200828 96.066938) (width 0.3) (layer "B.Cu") (net 4) (tstamp e9bf87cb-c1e6-4ad1-8674-6c63555ba6a4))
   (segment (start 151.59 102.15) (end 151.6 102.16) (width 0.3) (layer "F.Cu") (net 5) (tstamp 1f2849c9-33c2-435a-9ce3-b5ab3ca04010))
-  (segment (start 151.588197 101.086793) (end 151.59 101.08499) (width 0.25) (layer "F.Cu") (net 5) (tstamp 23ac2e4f-a946-419c-8bfb-a925b7972e60))
   (segment (start 151.59 101.08499) (end 151.59 102.15) (width 0.3) (layer "F.Cu") (net 5) (tstamp 408c2135-06ae-4cd9-a686-933d660c1beb))
   (via (at 151.59 101.08499) (size 0.5) (drill 0.3) (layers "F.Cu" "B.Cu") (net 5) (tstamp d36fff63-b962-43a3-bfb2-df9c07327ac7))
   (via (at 151.6 102.16) (size 0.5) (drill 0.3) (layers "F.Cu" "B.Cu") (net 5) (tstamp d7950213-4f23-4156-845d-8501abf8dc77))
+  (segment (start 151.59 100.81) (end 151.59 101.08499) (width 0.25) (layer "B.Cu") (net 5) (tstamp 0a800f4a-4b74-4233-8ba3-e1ea9b0e6236))
   (segment (start 147.785964 103.481802) (end 147.618198 103.481802) (width 0.25) (layer "B.Cu") (net 5) (tstamp 317d6def-3a3e-4736-9aab-23bb9134aa7b))
+  (segment (start 152.166868 97.137773) (end 152.09401 97.362005) (width 0.25) (layer "B.Cu") (net 5) (tstamp 33b5362e-263b-44cf-977c-e0d27ce007b2))
   (segment (start 152.809449 102.577215) (end 153.33033 103.098096) (width 0.3) (layer "B.Cu") (net 5) (tstamp 363a2be0-88fc-4b4f-8a8c-df6b16c8792a))
   (segment (start 152.290522 102.058288) (end 152.809449 102.577215) (width 0.25) (layer "B.Cu") (net 5) (tstamp 458cad71-cb70-49c8-a9b1-bb66db6cea15))
   (segment (start 148.655025 105.126759) (end 147.473241 103.944975) (width 0.15) (layer "B.Cu") (net 5) (tstamp 4aaf39dc-b663-413f-bfb2-44c2dcf01ef3))
+  (segment (start 152.494347 96.652099) (end 152.412488 96.736956) (width 0.25) (layer "B.Cu") (net 5) (tstamp 4ff2752d-bf9e-4874-8f88-bde6a8769b9f))
   (segment (start 151.251952 102.137136) (end 151.577136 102.137136) (width 0.25) (layer "B.Cu") (net 5) (tstamp 5c245d8e-b212-4923-b42a-542cfced5443))
   (segment (start 153.516555 95.629891) (end 154.644112 94.502334) (width 0.25) (layer "B.Cu") (net 5) (tstamp 60bc0c97-0c72-43c1-be69-4f01ab6332b3))
   (segment (start 151.251952 102.137136) (end 149.751212 103.637876) (width 0.25) (layer "B.Cu") (net 5) (tstamp 62057549-eef7-4f0b-babc-1c209bee9ccf))
-  (segment (start 151.59 100.909862) (end 152.142464 100.357398) (width 0.25) (layer "B.Cu") (net 5) (tstamp 678ecb02-aace-44f1-9a13-6e31ff94bbfb))
+  (segment (start 152.273906 96.927699) (end 152.166868 97.137773) (width 0.25) (layer "B.Cu") (net 5) (tstamp 64dbd92c-6b81-4ce1-a1e9-558b02ea511c))
   (segment (start 153.55 103.628426) (end 153.55 103.9) (width 0.3) (layer "B.Cu") (net 5) (tstamp 68bc015f-4718-4e05-9064-41ed4e228bfb))
-  (segment (start 152.055007 98.530156) (end 152.055007 97.712759) (width 0.25) (layer "B.Cu") (net 5) (tstamp 6b52923c-b77d-4de4-bb17-53def997f02f))
+  (segment (start 152.055007 98.530156) (end 152.055289 98.569883) (width 0.25) (layer "B.Cu") (net 5) (tstamp 6f41e6e8-1fce-41ed-80dd-b764232396eb))
   (segment (start 149.200695 104.899305) (end 149.118198 104.981802) (width 0.25) (layer "B.Cu") (net 5) (tstamp 70520d48-9397-4522-b3ed-534f8230e270))
   (segment (start 151.6 102.16) (end 151.701712 102.058288) (width 0.25) (layer "B.Cu") (net 5) (tstamp 719423d0-9699-4c08-a963-fa185b8746ed))
+  (segment (start 152.153564 98.711158) (end 152.153564 100.346314) (width 0.25) (layer "B.Cu") (net 5) (tstamp 747602a2-6770-433f-baa5-23e58fe14a24))
+  (segment (start 152.057127 97.594873) (end 152.055007 97.712759) (width 0.25) (layer "B.Cu") (net 5) (tstamp 753f0c2a-00e7-41c9-b68f-92ff6e5cd935))
   (segment (start 149.200695 104.312657) (end 149.200695 104.899305) (width 0.25) (layer "B.Cu") (net 5) (tstamp 79009bd6-1e1c-4d1d-afd8-255cd2198737))
   (segment (start 149.118198 104.981802) (end 148.973241 105.126759) (width 0.15) (layer "B.Cu") (net 5) (tstamp 7a8f6b10-487b-43a0-a20a-70c1e20a4b72))
   (segment (start 147.473241 103.626759) (end 147.618198 103.481802) (width 0.15) (layer "B.Cu") (net 5) (tstamp 92178b33-fdd8-4faa-9e80-0f7091be94b1))
-  (segment (start 152.494347 96.652099) (end 153.516555 95.629891) (width 0.25) (layer "B.Cu") (net 5) (tstamp 934851df-42d2-4561-8b73-011efd078d35))
   (segment (start 151.701712 102.058288) (end 152.290522 102.058288) (width 0.25) (layer "B.Cu") (net 5) (tstamp 9767a54e-b0c0-45d7-92e4-86431690f708))
   (segment (start 151.577136 102.137136) (end 151.6 102.16) (width 0.25) (layer "B.Cu") (net 5) (tstamp 9bc2b31d-ea72-4b32-9def-c87615b9225b))
+  (segment (start 152.085694 98.643288) (end 152.153564 98.711158) (width 0.25) (layer "B.Cu") (net 5) (tstamp a39ef9e3-12cd-4ede-aaa5-a8724f96bf45))
+  (segment (start 152.412488 96.736956) (end 152.273906 96.927699) (width 0.25) (layer "B.Cu") (net 5) (tstamp a6b6791d-f856-4e79-84d3-6d92ecdc89d1))
+  (segment (start 152.055007 97.712759) (end 152.055007 98.530156) (width 0.25) (layer "B.Cu") (net 5) (tstamp a866d3d5-b847-4f4f-963a-9d45d77615b1))
   (segment (start 154.644112 94.502334) (end 154.644112 94.252334) (width 0.25) (layer "B.Cu") (net 5) (tstamp aac5c3fb-294a-439d-bab9-07b379f7f747))
   (segment (start 151.6 102.148536) (end 151.6 102.16) (width 0.25) (layer "B.Cu") (net 5) (tstamp b083b90a-897c-457b-a0f0-9eb29bc60031))
+  (segment (start 153.516555 95.629891) (end 152.494347 96.652099) (width 0.25) (layer "B.Cu") (net 5) (tstamp b8949e54-0d42-4f87-bac0-08cbe12713d5))
+  (segment (start 151.746436 100.653564) (end 151.59 100.81) (width 0.25) (layer "B.Cu") (net 5) (tstamp c9c27dc2-ffdf-42c5-bd20-80d44e4a8e6b))
   (segment (start 148.690551 102.577215) (end 147.785964 103.481802) (width 0.25) (layer "B.Cu") (net 5) (tstamp ca89fd9f-9070-4202-a5d2-82930cd4929c))
+  (segment (start 152.055289 98.569883) (end 152.085694 98.643288) (width 0.25) (layer "B.Cu") (net 5) (tstamp d3caf339-7cf6-478e-a953-49ba76420ef7))
   (segment (start 148.973241 105.126759) (end 148.655025 105.126759) (width 0.15) (layer "B.Cu") (net 5) (tstamp e09510de-a317-4898-88aa-6413bda64ba7))
+  (segment (start 152.153564 100.346314) (end 151.846314 100.653564) (width 0.25) (layer "B.Cu") (net 5) (tstamp e3513aa8-4b17-4d20-af91-195397e2afe3))
+  (segment (start 151.846314 100.653564) (end 151.746436 100.653564) (width 0.25) (layer "B.Cu") (net 5) (tstamp e37eb53c-2967-4b8b-ae6c-1a75b8dc481d))
   (segment (start 149.751212 103.637876) (end 149.288563 104.100525) (width 0.25) (layer "B.Cu") (net 5) (tstamp e830f29a-0276-484e-bb5b-06c048cceaa3))
-  (segment (start 152.126409 98.684401) (end 152.113586 98.671578) (width 0.25) (layer "B.Cu") (net 5) (tstamp f69f8cb8-b3cb-43f8-88b2-c56be848e0bf))
+  (segment (start 152.09401 97.362005) (end 152.057127 97.594873) (width 0.25) (layer "B.Cu") (net 5) (tstamp f0efb7a7-902f-476b-a533-129cf18b4123))
   (segment (start 147.473241 103.944975) (end 147.473241 103.626759) (width 0.15) (layer "B.Cu") (net 5) (tstamp fb1ffcdd-0859-446b-8a07-8c3dcfad9aef))
-  (segment (start 152.184988 100.126484) (end 152.184988 98.825822) (width 0.25) (layer "B.Cu") (net 5) (tstamp ffdceb6b-70a9-4b0d-a810-19df5a02952d))
-  (arc (start 152.184988 98.825822) (mid 152.169764 98.749285) (end 152.126409 98.684401) (width 0.25) (layer "B.Cu") (net 5) (tstamp 2bd64efe-3a05-4769-8961-762cc04a5cf1))
   (arc (start 153.33033 103.098096) (mid 153.49291 103.341413) (end 153.55 103.628426) (width 0.3) (layer "B.Cu") (net 5) (tstamp 3598cbef-7eb8-4912-a88a-37fcd0a9fad0))
-  (arc (start 152.113586 98.671578) (mid 152.070231 98.606693) (end 152.055007 98.530156) (width 0.25) (layer "B.Cu") (net 5) (tstamp 7d2ecc60-b4af-4d95-9ca8-f5b9d38d37f9))
-  (arc (start 152.142464 100.357398) (mid 152.173459 100.243538) (end 152.184988 100.126484) (width 0.25) (layer "B.Cu") (net 5) (tstamp 8925c146-6833-45f0-95f5-f078518c2043))
-  (arc (start 152.055007 97.712759) (mid 152.169188 97.138734) (end 152.494347 96.652099) (width 0.25) (layer "B.Cu") (net 5) (tstamp ac0115cd-e290-4cf3-bb8f-b45483741b5b))
   (arc (start 149.200695 104.312657) (mid 149.223531 104.197852) (end 149.288563 104.100525) (width 0.25) (layer "B.Cu") (net 5) (tstamp fd81571f-4c61-41f5-baf6-5fdf6ee9de8a))
   (segment (start 145.702747 95.988281) (end 145.55779 95.843324) (width 0.15) (layer "B.Cu") (net 6) (tstamp 157313e6-665c-450c-b80d-1b605db85c12))
   (segment (start 146.096251 95.988281) (end 145.702747 95.988281) (width 0.15) (layer "B.Cu") (net 6) (tstamp 58131191-1832-45b3-b63a-2b16de3f2168))
@@ -13406,9 +13412,6 @@
         (xy 153.864023 106.142808)
         (xy 153.852812 106.152009)
         (xy 153.83587 106.163329)
-        (xy 153.820501 106.18633)
-        (xy 153.8205 106.186331)
-        (xy 153.808344 106.204524)
         (xy 153.774979 106.254458)
         (xy 153.772063 106.269117)
         (xy 153.753597 106.361953)
@@ -13702,8 +13705,7 @@
         (xy 144.076434 119.832687)
         (xy 144.051124 119.78885)
         (xy 144.05 119.776)
-        (xy 144.05 109.155354)
-        (xy 147.8495 109.155354)
+        (xy 144.05 109.344646)
         (xy 147.8495 109.344646)
         (xy 147.888856 109.529803)
         (xy 147.965849 109.70273)
@@ -13826,7 +13828,8 @@
         (xy 147.89575 108.954714)
         (xy 147.888856 108.970197)
         (xy 147.8495 109.155354)
-        (xy 144.05 109.155354)
+        (xy 147.8495 109.344646)
+        (xy 144.05 109.344646)
         (xy 144.05 108.529487)
         (xy 144.052522 108.510334)
         (xy 144.052769 108.509412)
@@ -13862,13 +13865,7 @@
         (xy 142.288357 108.088071)
         (xy 142.161929 107.961643)
         (xy 142.153638 107.951762)
-        (xy 142.051088 107.805305)
-        (xy 142.044638 107.794134)
-        (xy 142.009744 107.719304)
-        (xy 141.969071 107.632082)
-        (xy 141.964665 107.619976)
-        (xy 141.927226 107.480252)
-        (xy 145.7995 107.480252)
+        (xy 142.061201 107.819748)
         (xy 145.7995 107.819748)
         (xy 145.811133 107.878231)
         (xy 145.855448 107.944552)
@@ -14004,7 +14001,13 @@
         (xy 145.817989 107.411509)
         (xy 145.811133 107.421769)
         (xy 145.7995 107.480252)
-        (xy 141.927226 107.480252)
+        (xy 145.7995 107.819748)
+        (xy 142.061201 107.819748)
+        (xy 142.051088 107.805305)
+        (xy 142.044638 107.794134)
+        (xy 142.009744 107.719304)
+        (xy 141.969071 107.632082)
+        (xy 141.964665 107.619976)
         (xy 141.918386 107.447261)
         (xy 141.916148 107.434564)
         (xy 141.908705 107.3495)
@@ -14015,8 +14018,7 @@
         (xy 141.905291 107.25)
         (xy 141.902522 107.239666)
         (xy 141.9 107.220513)
-        (xy 141.9 105.098709)
-        (xy 142.05 105.098709)
+        (xy 141.9 105.561398)
         (xy 142.05 105.561398)
         (xy 142.050469 105.573253)
         (xy 142.051393 105.584908)
@@ -14101,7 +14103,7 @@
         (xy 146.395696 106.144988)
         (xy 146.397856 106.130431)
         (xy 146.398033 106.12864)
-        (xy 146.398469 106.124208)
+        (xy 146.398391 106.125)
         (xy 146.399278 106.115995)
         (xy 146.4 106.101291)
         (xy 146.4 105.998709)
@@ -14263,14 +14265,9 @@
         (xy 142.052144 105.069569)
         (xy 142.050722 105.084005)
         (xy 142.05 105.098709)
-        (xy 141.9 105.098709)
-        (xy 141.9 99.471331)
-        (xy 142.730071 99.471331)
-        (xy 142.73254 99.483742)
-        (xy 142.733067 99.486393)
-        (xy 142.734489 99.50083)
-        (xy 142.734489 100.982013)
-        (xy 142.733067 100.996449)
+        (xy 142.05 105.561398)
+        (xy 141.9 105.561398)
+        (xy 141.9 101.011512)
         (xy 142.730071 101.011512)
         (xy 142.731493 101.018659)
         (xy 142.731493 101.020359)
@@ -14870,9 +14867,6 @@
         (xy 148.998477 105.966915)
         (xy 148.978258 106.068556)
         (xy 148.998477 106.170198)
-        (xy 149.002526 106.176258)
-        (xy 149.002527 106.17626)
-        (xy 149.009253 106.186326)
         (xy 149.04152 106.234618)
         (xy 149.700054 106.893152)
         (xy 149.734462 106.916142)
@@ -15301,7 +15295,7 @@
         (xy 156.373207 97.416622)
         (xy 156.387864 97.342936)
         (xy 156.389286 97.335787)
-        (xy 156.383091 97.304644)
+        (xy 156.383602 97.307211)
         (xy 156.373207 97.254952)
         (xy 156.373206 97.25495)
         (xy 156.371784 97.247801)
@@ -15309,15 +15303,15 @@
         (xy 156.352947 97.219609)
         (xy 156.334525 97.19204)
         (xy 156.197048 97.054564)
-        (xy 156.159798 97.029673)
+        (xy 156.163307 97.032018)
         (xy 156.14735 97.021355)
         (xy 156.147349 97.021354)
         (xy 156.141287 97.017304)
-        (xy 156.1067 97.010424)
+        (xy 156.10019 97.009129)
         (xy 156.087141 97.006533)
         (xy 156.043867 96.980272)
         (xy 156.029001 96.948393)
-        (xy 156.019652 96.901398)
+        (xy 156.022242 96.914418)
         (xy 156.01823 96.894247)
         (xy 155.980971 96.838486)
         (xy 155.843494 96.70101)
@@ -15335,6 +15329,8 @@
         (xy 155.611761 96.66375)
         (xy 155.556 96.701009)
         (xy 154.587674 97.669336)
+        (xy 154.585657 97.672355)
+        (xy 154.560749 97.709631)
         (xy 154.550414 97.725097)
         (xy 154.548992 97.732246)
         (xy 154.548991 97.732248)
@@ -15371,7 +15367,7 @@
         (xy 154.30133 98.601077)
         (xy 154.298686 98.606267)
         (xy 154.298684 98.606269)
-        (xy 154.24857 98.704623)
+        (xy 154.24638 98.708921)
         (xy 154.243734 98.714115)
         (xy 154.242823 98.719867)
         (xy 154.242822 98.71987)
@@ -17094,7 +17090,7 @@
         (xy 144.05539 96.888184)
         (xy 144.045215 96.93934)
         (xy 144.046637 96.946489)
-        (xy 144.055972 96.993418)
+        (xy 144.059097 97.009129)
         (xy 144.060776 97.017572)
         (xy 144.093904 97.067151)
         (xy 144.333964 97.307211)
@@ -17109,17 +17105,18 @@
         (xy 144.540006 97.340339)
         (xy 144.589586 97.307211)
         (xy 144.900356 96.996441)
-        (xy 144.902645 96.993016)
-        (xy 144.929436 96.952919)
         (xy 144.933484 96.946861)
-        (xy 144.94395 96.894247)
+        (xy 144.939108 96.91859)
         (xy 144.945726 96.885317)
         (xy 144.971986 96.842042)
         (xy 145.003866 96.827176)
         (xy 145.066434 96.81473)
+        (xy 145.075073 96.808958)
+        (xy 145.110519 96.785274)
+        (xy 145.11052 96.785273)
         (xy 145.113542 96.783254)
         (xy 145.43706 96.459736)
-        (xy 145.441244 96.453475)
+        (xy 145.442764 96.4512)
         (xy 145.464487 96.418688)
         (xy 145.468536 96.412628)
         (xy 145.480165 96.354169)
@@ -17257,7 +17254,7 @@
         (xy 144.431055 100.684708)
         (xy 144.429099 100.694544)
         (xy 144.430521 100.701693)
-        (xy 144.44233 100.761059)
+        (xy 144.434802 100.723213)
         (xy 144.44466 100.772775)
         (xy 144.448708 100.778833)
         (xy 144.472401 100.814292)
@@ -17379,7 +17376,7 @@
         (xy 144.096558 98.959549)
         (xy 144.114581 98.845752)
         (xy 144.115492 98.84)
-        (xy 144.110522 98.80862)
+        (xy 144.110932 98.811209)
         (xy 144.096558 98.720451)
         (xy 144.096557 98.720448)
         (xy 144.095646 98.714696)
@@ -17455,7 +17452,7 @@
         (xy 142.862416 98.809595)
         (xy 142.86164 98.811882)
         (xy 142.861638 98.811886)
-        (xy 142.836768 98.885152)
+        (xy 142.836642 98.885523)
         (xy 142.789709 99.023781)
         (xy 142.789238 99.02615)
         (xy 142.789237 99.026153)
@@ -17466,7 +17463,13 @@
         (xy 142.737504 99.368858)
         (xy 142.73114 99.465955)
         (xy 142.730071 99.471331)
-        (xy 141.9 99.471331)
+        (xy 142.73254 99.483742)
+        (xy 142.733067 99.486393)
+        (xy 142.734489 99.50083)
+        (xy 142.734489 100.982013)
+        (xy 142.733067 100.996449)
+        (xy 142.730071 101.011512)
+        (xy 141.9 101.011512)
         (xy 141.9 97.74)
         (xy 144.664508 97.74)
         (xy 144.665419 97.745752)
@@ -17524,7 +17527,7 @@
         (xy 146.080705 98.78143)
         (xy 146.084182 98.782485)
         (xy 146.084185 98.782486)
-        (xy 146.136704 98.798417)
+        (xy 146.139278 98.799198)
         (xy 146.170339 98.80862)
         (xy 146.173951 98.808976)
         (xy 146.173952 98.808976)
@@ -17611,6 +17614,8 @@
         (xy 146.951009 97.732248)
         (xy 146.951008 97.732246)
         (xy 146.949586 97.725097)
+        (xy 146.940141 97.710961)
+        (xy 146.919728 97.680412)
         (xy 146.912327 97.669336)
         (xy 145.944 96.70101)
         (xy 145.918614 96.684047)
@@ -17627,24 +17632,24 @@
         (xy 145.712267 96.66375)
         (xy 145.656506 96.701009)
         (xy 145.51903 96.838486)
-        (xy 145.502067 96.863872)
+        (xy 145.507961 96.855051)
         (xy 145.489102 96.883275)
         (xy 145.48177 96.894247)
-        (xy 145.480348 96.901398)
+        (xy 145.477758 96.914418)
         (xy 145.470999 96.948393)
         (xy 145.444738 96.991667)
         (xy 145.412859 97.006533)
-        (xy 145.3933 97.010424)
+        (xy 145.39981 97.009129)
         (xy 145.358713 97.017304)
         (xy 145.352651 97.021355)
         (xy 145.35265 97.021355)
-        (xy 145.340202 97.029673)
+        (xy 145.344452 97.026833)
         (xy 145.302952 97.054563)
         (xy 145.165476 97.19204)
         (xy 145.148513 97.217426)
         (xy 145.133125 97.240455)
         (xy 145.128216 97.247801)
-        (xy 145.126794 97.254952)
+        (xy 145.123732 97.270342)
         (xy 145.122363 97.277225)
         (xy 145.096103 97.320499)
         (xy 145.061361 97.335876)
@@ -17663,7 +17668,7 @@
         (xy 144.684354 97.614696)
         (xy 144.683443 97.620448)
         (xy 144.683442 97.620451)
-        (xy 144.667829 97.719034)
+        (xy 144.673508 97.683175)
         (xy 144.664508 97.74)
         (xy 141.9 97.74)
         (xy 141.9 81.279487)
@@ -17775,72 +17780,141 @@
         (xy 152.666699 96.035816)
         (xy 152.663388 96.086327)
         (xy 152.647981 96.108849)
-        (xy 152.323877 96.432953)
-        (xy 152.312663 96.442156)
-        (xy 152.295723 96.453475)
-        (xy 152.291672 96.459538)
-        (xy 152.291671 96.459539)
-        (xy 152.285788 96.467204)
-        (xy 152.144985 96.62776)
-        (xy 152.144981 96.627765)
-        (xy 152.143386 96.629584)
-        (xy 152.01408 96.823104)
-        (xy 151.997834 96.856048)
-        (xy 151.923623 97.006533)
-        (xy 151.911139 97.031847)
-        (xy 151.910361 97.03414)
-        (xy 151.910359 97.034144)
-        (xy 151.837833 97.247801)
-        (xy 151.836326 97.25224)
-        (xy 151.835853 97.254615)
-        (xy 151.835852 97.254621)
-        (xy 151.79887 97.440539)
-        (xy 151.790919 97.480512)
-        (xy 151.790762 97.482913)
-        (xy 151.790761 97.482918)
-        (xy 151.776794 97.696022)
-        (xy 151.775532 97.705603)
-        (xy 151.775532 97.705611)
-        (xy 151.77411 97.712759)
-        (xy 151.775532 97.719908)
-        (xy 151.778085 97.732743)
-        (xy 151.779507 97.747179)
-        (xy 151.779507 98.495735)
-        (xy 151.778085 98.510172)
-        (xy 151.77411 98.530155)
-        (xy 151.775532 98.537303)
-        (xy 151.779535 98.557427)
-        (xy 151.7806 98.564606)
-        (xy 151.782081 98.579644)
-        (xy 151.786012 98.619549)
-        (xy 151.786388 98.62337)
-        (xy 151.801531 98.67329)
-        (xy 151.804598 98.6834)
-        (xy 151.813577 98.713002)
-        (xy 151.857731 98.795608)
-        (xy 151.860035 98.798415)
-        (xy 151.860036 98.798417)
-        (xy 151.870534 98.811209)
-        (xy 151.887119 98.831417)
-        (xy 151.892691 98.838207)
-        (xy 151.909488 98.885152)
-        (xy 151.909488 100.089503)
-        (xy 151.907849 100.10499)
-        (xy 151.904121 100.122408)
-        (xy 151.90562 100.13056)
-        (xy 151.906329 100.134416)
-        (xy 151.907366 100.152997)
-        (xy 151.906445 100.166067)
-        (xy 151.905405 100.174258)
-        (xy 151.902672 100.189102)
-        (xy 151.882222 100.228024)
-        (xy 151.376006 100.73424)
-        (xy 151.373986 100.737263)
-        (xy 151.37168 100.740073)
-        (xy 151.371113 100.739608)
-        (xy 151.357345 100.753935)
-        (xy 151.35685 100.754294)
-        (xy 151.351658 100.75694)
+        (xy 152.318071 96.438759)
+        (xy 152.316582 96.440133)
+        (xy 152.314906 96.441297)
+        (xy 152.312383 96.443913)
+        (xy 152.31238 96.443915)
+        (xy 152.298251 96.458562)
+        (xy 152.297319 96.459511)
+        (xy 152.280353 96.476477)
+        (xy 152.279222 96.478169)
+        (xy 152.27787 96.479688)
+        (xy 152.221146 96.53849)
+        (xy 152.21812 96.541453)
+        (xy 152.205552 96.553071)
+        (xy 152.203416 96.556011)
+        (xy 152.202035 96.557565)
+        (xy 152.199171 96.56098)
+        (xy 152.197894 96.562595)
+        (xy 152.195371 96.56521)
+        (xy 152.193406 96.568269)
+        (xy 152.186106 96.57963)
+        (xy 152.183716 96.583125)
+        (xy 152.090266 96.71175)
+        (xy 152.055062 96.760204)
+        (xy 152.053314 96.762514)
+        (xy 152.040752 96.778449)
+        (xy 152.039104 96.781684)
+        (xy 152.038147 96.783179)
+        (xy 152.037218 96.784764)
+        (xy 152.035073 96.787716)
+        (xy 152.033548 96.791025)
+        (xy 152.033547 96.791026)
+        (xy 152.02658 96.806138)
+        (xy 152.025312 96.808751)
+        (xy 151.924519 97.006568)
+        (xy 151.923151 97.009129)
+        (xy 151.915011 97.023664)
+        (xy 151.915008 97.02367)
+        (xy 151.913237 97.026833)
+        (xy 151.912116 97.030283)
+        (xy 151.911391 97.03194)
+        (xy 151.910726 97.033639)
+        (xy 151.909078 97.036874)
+        (xy 151.908092 97.040371)
+        (xy 151.903577 97.056378)
+        (xy 151.902734 97.059156)
+        (xy 151.834116 97.270342)
+        (xy 151.833164 97.273088)
+        (xy 151.826147 97.292108)
+        (xy 151.825577 97.295704)
+        (xy 151.82512 97.297456)
+        (xy 151.824734 97.299214)
+        (xy 151.82361 97.302675)
+        (xy 151.822834 97.309231)
+        (xy 151.821228 97.322798)
+        (xy 151.82083 97.325675)
+        (xy 151.786584 97.54189)
+        (xy 151.785802 97.546052)
+        (xy 151.782931 97.55924)
+        (xy 151.78293 97.55925)
+        (xy 151.782159 97.562791)
+        (xy 151.782094 97.566421)
+        (xy 151.781856 97.568459)
+        (xy 151.781466 97.572899)
+        (xy 151.781343 97.574979)
+        (xy 151.780774 97.578574)
+        (xy 151.781401 97.594508)
+        (xy 151.781447 97.595686)
+        (xy 151.781492 97.599925)
+        (xy 151.780023 97.681599)
+        (xy 151.779905 97.683628)
+        (xy 151.779507 97.685626)
+        (xy 151.779507 97.709631)
+        (xy 151.779495 97.710961)
+        (xy 151.779064 97.734934)
+        (xy 151.779426 97.736939)
+        (xy 151.779507 97.738968)
+        (xy 151.779507 98.50349)
+        (xy 151.779476 98.50417)
+        (xy 151.779321 98.504979)
+        (xy 151.779337 98.507218)
+        (xy 151.779505 98.530869)
+        (xy 151.779507 98.531395)
+        (xy 151.779507 98.53688)
+        (xy 151.778085 98.551316)
+        (xy 151.774392 98.569882)
+        (xy 151.775814 98.577031)
+        (xy 151.779881 98.597476)
+        (xy 151.779983 98.598148)
+        (xy 151.779989 98.598971)
+        (xy 151.780441 98.601162)
+        (xy 151.785214 98.624302)
+        (xy 151.785318 98.624814)
+        (xy 151.786449 98.630498)
+        (xy 151.790377 98.650244)
+        (xy 151.790692 98.651004)
+        (xy 151.79086 98.651666)
+        (xy 151.796544 98.679217)
+        (xy 151.800635 98.685247)
+        (xy 151.800637 98.685251)
+        (xy 151.807281 98.695043)
+        (xy 151.814412 98.708271)
+        (xy 151.817993 98.716916)
+        (xy 151.822204 98.730798)
+        (xy 151.826179 98.750782)
+        (xy 151.830228 98.756842)
+        (xy 151.830229 98.756844)
+        (xy 151.841546 98.77378)
+        (xy 151.841548 98.773785)
+        (xy 151.865593 98.809772)
+        (xy 151.878064 98.850883)
+        (xy 151.878064 100.201546)
+        (xy 151.860751 100.249112)
+        (xy 151.85639 100.253872)
+        (xy 151.751273 100.358989)
+        (xy 151.713384 100.379241)
+        (xy 151.646092 100.392626)
+        (xy 151.646089 100.392627)
+        (xy 151.638941 100.394049)
+        (xy 151.596971 100.422093)
+        (xy 151.570814 100.43957)
+        (xy 151.570813 100.439571)
+        (xy 151.547812 100.45494)
+        (xy 151.543763 100.461)
+        (xy 151.536494 100.471879)
+        (xy 151.527291 100.483093)
+        (xy 151.419529 100.590855)
+        (xy 151.408318 100.600056)
+        (xy 151.391376 100.611376)
+        (xy 151.376007 100.634377)
+        (xy 151.376006 100.634378)
+        (xy 151.363187 100.653564)
+        (xy 151.330485 100.702505)
+        (xy 151.31912 100.75964)
+        (xy 151.316091 100.77487)
+        (xy 151.295839 100.812759)
         (xy 151.26195 100.846648)
         (xy 151.259306 100.851838)
         (xy 151.259304 100.85184)
@@ -17895,13 +17969,13 @@
         (xy 148.747951 100.818317)
         (xy 148.747948 100.818315)
         (xy 148.745137 100.816008)
-        (xy 148.741927 100.814292)
+        (xy 148.739059 100.812759)
         (xy 148.639681 100.75964)
         (xy 148.639679 100.759639)
         (xy 148.636472 100.757925)
         (xy 148.632995 100.75687)
         (xy 148.632992 100.756869)
-        (xy 148.576087 100.739608)
+        (xy 148.585209 100.742375)
         (xy 148.518564 100.722159)
         (xy 148.514955 100.721804)
         (xy 148.514952 100.721803)
@@ -17916,7 +17990,12 @@
         (xy 148.389578 100.513456)
         (xy 148.389577 100.513453)
         (xy 148.388522 100.509976)
+        (xy 148.358501 100.453809)
+        (xy 148.332155 100.404518)
+        (xy 148.332153 100.404515)
         (xy 148.330441 100.401312)
+        (xy 148.324481 100.394049)
+        (xy 148.271293 100.32924)
         (xy 148.269624 100.327206)
         (xy 148.265302 100.321378)
         (xy 148.258002 100.310452)
@@ -17948,7 +18027,7 @@
         (xy 148.383088 98.959904)
         (xy 148.417701 98.815725)
         (xy 148.42153 98.799778)
-        (xy 148.421758 98.796886)
+        (xy 148.425386 98.750782)
         (xy 148.435988 98.616074)
         (xy 148.437181 98.607446)
         (xy 148.437314 98.606777)
@@ -17960,8 +18039,13 @@
         (xy 148.434761 96.531376)
         (xy 148.437314 96.518542)
         (xy 148.438736 96.511393)
-        (xy 148.436219 96.498739)
-        (xy 148.426764 96.451201)
+        (xy 148.428418 96.459518)
+        (xy 148.428228 96.458562)
+        (xy 148.426764 96.4512)
+        (xy 148.427273 96.447894)
+        (xy 148.426996 96.445082)
+        (xy 148.426996 96.445081)
+        (xy 148.427706 96.445081)
         (xy 148.434465 96.401171)
         (xy 148.472523 96.367796)
         (xy 148.475785 96.366845)
diff --git a/demos/stickhub/StickHub.kicad_pro b/demos/stickhub/StickHub.kicad_pro
index 51dbd08a0d..3989acce08 100644
--- a/demos/stickhub/StickHub.kicad_pro
+++ b/demos/stickhub/StickHub.kicad_pro
@@ -384,7 +384,7 @@
       }
     ],
     "meta": {
-      "version": 1
+      "version": 2
     },
     "net_colors": null
   },
@@ -415,16 +415,19 @@
       "intersheets_ref_show": false,
       "intersheets_ref_suffix": "",
       "junction_size_choice": 3,
+      "label_size_ratio": 0.3,
       "pin_symbol_size": 25.0,
       "text_offset_ratio": 0.3
     },
     "legacy_lib_dir": "",
     "legacy_lib_list": [],
     "meta": {
-      "version": 0
+      "version": 1
     },
     "net_format_name": "",
     "ngspice": {
+      "fix_include_paths": true,
+      "fix_passive_vals": false,
       "meta": {
         "version": 0
       },