diff --git a/hw/kicad/lib/stmbl.lib b/hw/kicad/lib/stmbl.lib
index 27ac8b21..21f9c181 100644
--- a/hw/kicad/lib/stmbl.lib
+++ b/hw/kicad/lib/stmbl.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3
+EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
 # +12V
@@ -958,14 +958,36 @@ X VDD2 8 350 700 200 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# SP3481CN
+# SP3485
 #
-DEF SP3481CN U 0 40 Y Y 1 F N
+DEF SP3485 U 0 40 Y Y 1 F N
 F0 "U" -300 350 50 H V L CNN
-F1 "SP3481CN" 100 350 50 H V L CNN
+F1 "SP3485" 100 350 50 H V L CNN
+F2 "SO-8" 0 0 50 H V C CIN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ SO8*
+$ENDFPLIST
+DRAW
+S -300 300 300 -300 0 1 10 f
+X RO 1 -400 200 100 R 50 50 1 1 O
+X ~RE~ 2 -400 100 100 R 50 50 1 1 I
+X DE 3 -400 -100 100 R 50 50 1 1 I
+X DI 4 -400 -200 100 R 50 50 1 1 I
+X GND 5 0 -400 100 U 50 50 1 1 W
+X A 6 400 100 100 L 50 50 1 1 B
+X B 7 400 -100 100 L 50 50 1 1 B
+X VCC 8 0 400 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# RS4854
+#
+DEF RS4854 U 0 40 Y Y 1 F N
+F0 "U" -300 350 50 H V L CNN
+F1 "RS4854" 100 350 50 H V L CNN
 F2 "SO-8" 0 0 50 H V C CIN
 F3 "" 0 0 50 H V C CNN
-ALIAS SP3485CN
 $FPLIST
  SO8*
 $ENDFPLIST
@@ -1335,6 +1357,29 @@ X A 8 400 200 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# rs4854
+#
+DEF rs4854 U 0 40 Y Y 1 F N
+F0 "U" -300 350 50 H V L CNN
+F1 "rs4854" 100 350 50 H V L CNN
+F2 "SO-8" 0 0 50 H V C CIN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ SO8*
+$ENDFPLIST
+DRAW
+S -300 300 300 -300 0 1 10 f
+X VCC 1 0 400 100 D 50 50 1 1 W
+X RO 2 -400 100 100 R 50 50 1 1 O
+X DI 3 -400 -100 100 R 50 50 1 1 I
+X GND 4 0 -400 100 U 50 50 1 1 W
+X Y 5 400 -200 100 L 50 50 1 1 I
+X Z 6 400 -100 100 L 50 50 1 1 I
+X B 7 400 100 100 L 50 50 1 1 B
+X A 8 400 200 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # stm32f030
 #
 DEF stm32f030 U 0 40 Y Y 1 F N
diff --git a/hw/kicad/v4.0/cmd.sch b/hw/kicad/v4.0/cmd.sch
index bd55bc6e..c4f93f0a 100644
--- a/hw/kicad/v4.0/cmd.sch
+++ b/hw/kicad/v4.0/cmd.sch
@@ -15,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L stmbl_4.0-rescue:SP3485EN-RESCUE-stmbl_4.0 U8
+L stmbl:SP3485 U8
 U 1 1 565DD0E7
 P 5450 1400
 AR Path="/565DD0E7" Ref="U8"  Part="1" 
@@ -33,7 +33,7 @@ F 8 "" H 5450 1400 60  0001 C CNN "Tolerance"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L stmbl1:RJ45_LED J3
+L stmbl:RJ45_LED J3
 U 1 1 565DD759
 P 3000 3500
 F 0 "J3" H 3000 3000 50  0000 C CNN
@@ -49,7 +49,7 @@ F 8 "" H 3000 3450 60  0001 C CNN "Tolerance"
 	0    -1   1    0   
 $EndComp
 $Comp
-L stmbl1:R R63
+L stmbl:R R63
 U 1 1 565DD7F2
 P 4900 1400
 F 0 "R63" V 4980 1400 50  0000 C CNN
@@ -65,7 +65,7 @@ F 8 "" H 4900 1400 30  0001 C CNN "InternalName"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C53
+L stmbl:C C53
 U 1 1 565DD843
 P 6500 1400
 F 0 "C53" H 6525 1500 50  0000 L CNN
@@ -81,7 +81,7 @@ F 8 "" H 6500 1400 60  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR091
+L stmbl:GND #PWR091
 U 1 1 565DD8E9
 P 5450 1900
 F 0 "#PWR091" H 5450 1650 50  0001 C CNN
@@ -92,7 +92,7 @@ F 3 "" H 5450 1900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl_4.0-rescue:SP3485EN-RESCUE-stmbl_4.0 U9
+L stmbl:SP3485 U9
 U 1 1 565DDC9B
 P 5450 2800
 AR Path="/565DDC9B" Ref="U9"  Part="1" 
@@ -110,7 +110,7 @@ F 8 "" H 5450 2800 60  0001 C CNN "Tolerance"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R66
+L stmbl:R R66
 U 1 1 565DDCA1
 P 4900 2800
 F 0 "R66" V 4980 2800 50  0000 C CNN
@@ -126,7 +126,7 @@ F 8 "" H 4900 2800 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C54
+L stmbl:C C54
 U 1 1 565DDCA7
 P 6500 2800
 F 0 "C54" H 6525 2900 50  0000 L CNN
@@ -142,7 +142,7 @@ F 8 "" H 6500 2800 60  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR092
+L stmbl:GND #PWR092
 U 1 1 565DDCB0
 P 5450 3300
 F 0 "#PWR092" H 5450 3050 50  0001 C CNN
@@ -153,7 +153,7 @@ F 3 "" H 5450 3300 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl_4.0-rescue:SP3485EN-RESCUE-stmbl_4.0 U10
+L stmbl:SP3485 U10
 U 1 1 565DDF06
 P 5450 4200
 AR Path="/565DDF06" Ref="U10"  Part="1" 
@@ -171,7 +171,7 @@ F 8 "" H 5450 4200 60  0001 C CNN "Tolerance"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R69
+L stmbl:R R69
 U 1 1 565DDF0C
 P 4900 4200
 F 0 "R69" V 4980 4200 50  0000 C CNN
@@ -187,7 +187,7 @@ F 8 "" H 4900 4200 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C55
+L stmbl:C C55
 U 1 1 565DDF12
 P 6500 4200
 F 0 "C55" H 6525 4300 50  0000 L CNN
@@ -203,7 +203,7 @@ F 8 "" H 6500 4200 60  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR093
+L stmbl:GND #PWR093
 U 1 1 565DDF1B
 P 5450 4700
 F 0 "#PWR093" H 5450 4450 50  0001 C CNN
@@ -214,7 +214,7 @@ F 3 "" H 5450 4700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl_4.0-rescue:SP3485EN-RESCUE-stmbl_4.0 U11
+L stmbl:SP3485 U11
 U 1 1 565DDF3C
 P 5450 5600
 AR Path="/565DDF3C" Ref="U11"  Part="1" 
@@ -232,7 +232,7 @@ F 8 "" H 5450 5600 60  0001 C CNN "Tolerance"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R72
+L stmbl:R R72
 U 1 1 565DDF42
 P 4900 5600
 F 0 "R72" V 4980 5600 50  0000 C CNN
@@ -248,7 +248,7 @@ F 8 "" H 4900 5600 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C56
+L stmbl:C C56
 U 1 1 565DDF48
 P 6500 5600
 F 0 "C56" H 6525 5700 50  0000 L CNN
@@ -264,7 +264,7 @@ F 8 "" H 6500 5600 60  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR094
+L stmbl:GND #PWR094
 U 1 1 565DDF51
 P 5450 6100
 F 0 "#PWR094" H 5450 5850 50  0001 C CNN
@@ -275,7 +275,7 @@ F 3 "" H 5450 6100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R31
+L stmbl:R R31
 U 1 1 565DE65E
 P 3100 4350
 F 0 "R31" V 3180 4350 50  0000 C CNN
@@ -291,7 +291,7 @@ F 8 "" H 3100 4350 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C17
+L stmbl:C C17
 U 1 1 565DE6AE
 P 2900 4350
 F 0 "C17" H 2925 4450 50  0000 L CNN
@@ -307,7 +307,7 @@ F 8 "" H 2900 4350 60  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR095
+L stmbl:GND #PWR095
 U 1 1 565DE705
 P 3000 4550
 F 0 "#PWR095" H 3000 4300 50  0001 C CNN
@@ -318,7 +318,7 @@ F 3 "" H 3000 4550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR096
+L stmbl:GND #PWR096
 U 1 1 565DE73D
 P 2100 3950
 F 0 "#PWR096" H 2100 3700 50  0001 C CNN
@@ -329,7 +329,7 @@ F 3 "" H 2100 3950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR097
+L stmbl:GND #PWR097
 U 1 1 565DE775
 P 2100 3250
 F 0 "#PWR097" H 2100 3000 50  0001 C CNN
@@ -340,7 +340,7 @@ F 3 "" H 2100 3250 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R17
+L stmbl:R R17
 U 1 1 565DE7AD
 P 2300 3200
 F 0 "R17" V 2380 3200 50  0000 C CNN
@@ -356,7 +356,7 @@ F 8 "" H 2300 3200 30  0001 C CNN "Source"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R18
+L stmbl:R R18
 U 1 1 565DE83B
 P 2300 3900
 F 0 "R18" V 2380 3900 50  0000 C CNN
@@ -372,7 +372,7 @@ F 8 "" H 2300 3900 30  0001 C CNN "Source"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R62
+L stmbl:R R62
 U 1 1 56F9D4F8
 P 4900 1000
 F 0 "R62" V 4980 1000 50  0000 C CNN
@@ -388,7 +388,7 @@ F 8 "" H 4900 1000 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R64
+L stmbl:R R64
 U 1 1 56F9D5CB
 P 4900 1800
 F 0 "R64" V 4980 1800 50  0000 C CNN
@@ -404,7 +404,7 @@ F 8 "" H 4900 1800 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R65
+L stmbl:R R65
 U 1 1 56F9E212
 P 4900 2400
 F 0 "R65" V 4980 2400 50  0000 C CNN
@@ -420,7 +420,7 @@ F 8 "" H 4900 2400 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R67
+L stmbl:R R67
 U 1 1 56F9E5E6
 P 4900 3200
 F 0 "R67" V 4980 3200 50  0000 C CNN
@@ -436,7 +436,7 @@ F 8 "" H 4900 3200 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R68
+L stmbl:R R68
 U 1 1 56F9EA0F
 P 4900 3800
 F 0 "R68" V 4980 3800 50  0000 C CNN
@@ -452,7 +452,7 @@ F 8 "" H 4900 3800 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R70
+L stmbl:R R70
 U 1 1 56F9EFAF
 P 4900 4600
 F 0 "R70" V 4980 4600 50  0000 C CNN
@@ -468,7 +468,7 @@ F 8 "" H 4900 4600 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R71
+L stmbl:R R71
 U 1 1 56F9FEE2
 P 4900 5200
 F 0 "R71" V 4980 5200 50  0000 C CNN
@@ -484,7 +484,7 @@ F 8 "" H 4900 5200 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R73
+L stmbl:R R73
 U 1 1 56F9FFE7
 P 4900 6000
 F 0 "R73" V 4980 6000 50  0000 C CNN
@@ -500,7 +500,7 @@ F 8 "" H 4900 6000 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R101
+L stmbl:R R101
 U 1 1 57758B35
 P 6900 1600
 F 0 "R101" V 6980 1600 50  0000 C CNN
@@ -516,7 +516,7 @@ F 8 "" H 6900 1600 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR098
+L stmbl:GND #PWR098
 U 1 1 57758BC5
 P 6900 1800
 F 0 "#PWR098" H 6900 1550 50  0001 C CNN
@@ -527,7 +527,7 @@ F 3 "" H 6900 1800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R102
+L stmbl:R R102
 U 1 1 57758F9B
 P 6900 3000
 F 0 "R102" V 6980 3000 50  0000 C CNN
@@ -543,7 +543,7 @@ F 8 "" H 6900 3000 30  0001 C CNN "InternalName"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR099
+L stmbl:GND #PWR099
 U 1 1 57758FA1
 P 6900 3200
 F 0 "#PWR099" H 6900 2950 50  0001 C CNN
@@ -554,7 +554,7 @@ F 3 "" H 6900 3200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R103
+L stmbl:R R103
 U 1 1 577591B1
 P 6900 4400
 F 0 "R103" V 6980 4400 50  0000 C CNN
@@ -570,7 +570,7 @@ F 8 "" H 6900 4400 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0100
+L stmbl:GND #PWR0100
 U 1 1 577591B7
 P 6900 4600
 F 0 "#PWR0100" H 6900 4350 50  0001 C CNN
@@ -581,7 +581,7 @@ F 3 "" H 6900 4600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R104
+L stmbl:R R104
 U 1 1 5775928B
 P 6900 5800
 F 0 "R104" V 6980 5800 50  0000 C CNN
@@ -597,7 +597,7 @@ F 8 "" H 6900 5800 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0101
+L stmbl:GND #PWR0101
 U 1 1 57759291
 P 6900 6000
 F 0 "#PWR0101" H 6900 5750 50  0001 C CNN
@@ -608,7 +608,7 @@ F 3 "" H 6900 6000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:INDUCTOR L7
+L stmbl:INDUCTOR L7
 U 1 1 57AD7F96
 P 7700 950
 F 0 "L7" V 7650 950 50  0000 C CNN
@@ -624,7 +624,7 @@ F 8 "" H 7700 950 50  0001 C CNN "Tolerance"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:C C112
+L stmbl:C C112
 U 1 1 57AD80BE
 P 8100 1200
 F 0 "C112" H 8125 1300 50  0000 L CNN
@@ -640,7 +640,7 @@ F 8 "" H 8100 1200 60  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0102
+L stmbl:GND #PWR0102
 U 1 1 57AD9057
 P 8100 1450
 F 0 "#PWR0102" H 8100 1200 50  0001 C CNN
@@ -651,7 +651,7 @@ F 3 "" H 8100 1450 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:CONN_01X02 P15
+L stmbl:CONN_01X02 P15
 U 1 1 57B3D62F
 P 4400 4200
 F 0 "P15" H 4400 4350 50  0000 C CNN
@@ -667,7 +667,7 @@ F 8 "" H 4400 4200 60  0001 C CNN "Tolerance"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+5F #PWR0103
+L stmbl:+5F #PWR0103
 U 1 1 57D6FF89
 P 8100 850
 F 0 "#PWR0103" H 8100 700 50  0001 C CNN
@@ -678,7 +678,7 @@ F 3 "" H 8100 850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDD #PWR0104
+L stmbl:GNDD #PWR0104
 U 1 1 57F8452B
 P 2700 4250
 F 0 "#PWR0104" H 2700 4000 50  0001 C CNN
diff --git a/hw/kicad/v4.0/ctrl.sch b/hw/kicad/v4.0/ctrl.sch
index 6a28db40..e4ca1ee9 100644
--- a/hw/kicad/v4.0/ctrl.sch
+++ b/hw/kicad/v4.0/ctrl.sch
@@ -193,7 +193,7 @@ Wire Wire Line
 Wire Wire Line
 	1600 1800 1650 1800
 $Comp
-L stmbl1:+3.3V #PWR070
+L stmbl:+3.3V #PWR070
 U 1 1 578427DC
 P 1650 1550
 F 0 "#PWR070" H 1650 1400 50  0001 C CNN
@@ -208,7 +208,7 @@ Wire Wire Line
 Wire Wire Line
 	1650 1600 1600 1600
 $Comp
-L stmbl1:GND #PWR071
+L stmbl:GND #PWR071
 U 1 1 57848EA2
 P 1650 1950
 F 0 "#PWR071" H 1650 1700 50  0001 C CNN
@@ -223,7 +223,7 @@ Wire Wire Line
 Wire Wire Line
 	1650 1900 1650 1950
 $Comp
-L stmbl1:CONN_01X04 P14
+L stmbl:CONN_01X04 P14
 U 1 1 57AEB2FC
 P 1400 1750
 F 0 "P14" H 1400 2000 50  0000 C CNN
@@ -321,7 +321,7 @@ Wire Wire Line
 Wire Wire Line
 	3100 1750 2900 1750
 $Comp
-L stmbl1:non_plated U32
+L stmbl:non_plated U32
 U 1 1 5830D361
 P 6450 1250
 F 0 "U32" H 6450 900 60  0000 C CNN
@@ -332,7 +332,7 @@ F 3 "" H 6450 1250 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:OPEN_HARDWARE_1 LOGO1
+L stmbl:OPEN_HARDWARE_1 LOGO1
 U 1 1 58341DA7
 P 2400 5400
 F 0 "LOGO1" H 2400 5675 50  0000 C CNN
diff --git a/hw/kicad/v4.0/cur.sch b/hw/kicad/v4.0/cur.sch
index 4a35a9de..7fe26d1d 100644
--- a/hw/kicad/v4.0/cur.sch
+++ b/hw/kicad/v4.0/cur.sch
@@ -27,7 +27,7 @@ A_IV
 Text HLabel 7200 3000 2    60   Input ~ 0
 A_IW
 $Comp
-L stmbl1:+3.3VP #PWR064
+L stmbl:+3.3VP #PWR064
 U 1 1 57747146
 P 4700 2500
 F 0 "#PWR064" H 4850 2450 50  0001 C CNN
@@ -38,7 +38,7 @@ F 3 "" H 4700 2500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR065
+L stmbl:GNDPWR #PWR065
 U 1 1 5774715A
 P 4700 3500
 F 0 "#PWR065" H 4700 3300 50  0001 C CNN
@@ -49,7 +49,7 @@ F 3 "" H 4700 3450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R46
+L stmbl:R R46
 U 1 1 5774716E
 P 4450 3000
 F 0 "R46" V 4530 3000 50  0000 C CNN
@@ -65,7 +65,7 @@ F 8 "1%" H 4450 3000 50  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C33
+L stmbl:C C33
 U 1 1 57747194
 P 4700 3250
 F 0 "C33" H 4725 3350 50  0000 L CNN
@@ -81,7 +81,7 @@ F 8 "X7R" H 4700 3250 50  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R58
+L stmbl:R R58
 U 1 1 57747224
 P 4700 2750
 F 0 "R58" V 4780 2750 50  0000 C CNN
@@ -108,7 +108,7 @@ Connection ~ 4700 3000
 Wire Wire Line
 	4700 2500 4700 2600
 $Comp
-L stmbl1:+3.3VP #PWR066
+L stmbl:+3.3VP #PWR066
 U 1 1 57747506
 P 5900 2500
 F 0 "#PWR066" H 6050 2450 50  0001 C CNN
@@ -119,7 +119,7 @@ F 3 "" H 5900 2500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR067
+L stmbl:GNDPWR #PWR067
 U 1 1 5774750C
 P 5900 3500
 F 0 "#PWR067" H 5900 3300 50  0001 C CNN
@@ -130,7 +130,7 @@ F 3 "" H 5900 3450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R84
+L stmbl:R R84
 U 1 1 57747512
 P 5650 3000
 F 0 "R84" V 5730 3000 50  0000 C CNN
@@ -146,7 +146,7 @@ F 8 "1%" H 5650 3000 50  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C45
+L stmbl:C C45
 U 1 1 57747518
 P 5900 3250
 F 0 "C45" H 5925 3350 50  0000 L CNN
@@ -162,7 +162,7 @@ F 8 "X7R" H 5900 3250 50  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R90
+L stmbl:R R90
 U 1 1 5774751E
 P 5900 2750
 F 0 "R90" V 5980 2750 50  0000 C CNN
@@ -189,7 +189,7 @@ Connection ~ 5900 3000
 Wire Wire Line
 	5900 2500 5900 2600
 $Comp
-L stmbl1:+3.3VP #PWR068
+L stmbl:+3.3VP #PWR068
 U 1 1 5774767B
 P 7100 2500
 F 0 "#PWR068" H 7250 2450 50  0001 C CNN
@@ -200,7 +200,7 @@ F 3 "" H 7100 2500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR069
+L stmbl:GNDPWR #PWR069
 U 1 1 57747681
 P 7100 3500
 F 0 "#PWR069" H 7100 3300 50  0001 C CNN
@@ -211,7 +211,7 @@ F 3 "" H 7100 3450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R100
+L stmbl:R R100
 U 1 1 57747687
 P 6850 3000
 F 0 "R100" V 6930 3000 50  0000 C CNN
@@ -227,7 +227,7 @@ F 8 "1%" H 6850 3000 50  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C57
+L stmbl:C C57
 U 1 1 5774768D
 P 7100 3250
 F 0 "C57" H 7125 3350 50  0000 L CNN
@@ -243,7 +243,7 @@ F 8 "X7R" H 7100 3250 50  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R107
+L stmbl:R R107
 U 1 1 57747693
 P 7100 2750
 F 0 "R107" V 7180 2750 50  0000 C CNN
diff --git a/hw/kicad/v4.0/f3.sch b/hw/kicad/v4.0/f3.sch
index 20b86316..110c46fc 100644
--- a/hw/kicad/v4.0/f3.sch
+++ b/hw/kicad/v4.0/f3.sch
@@ -15,346 +15,346 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L stmbl1:GNDPWR #PWR012
+L stmbl:GNDPWR #PWR012
 U 1 1 5663134A
-P 9900 5000
-F 0 "#PWR012" H 9900 4800 50  0001 C CNN
-F 1 "GNDPWR" H 9900 4870 50  0000 C CNN
-F 2 "" H 9900 4950 60  0000 C CNN
-F 3 "" H 9900 4950 60  0000 C CNN
-	1    9900 5000
+P 10000 4700
+F 0 "#PWR012" H 10000 4500 50  0001 C CNN
+F 1 "GNDPWR" H 10000 4570 50  0000 C CNN
+F 2 "" H 10000 4650 60  0000 C CNN
+F 3 "" H 10000 4650 60  0000 C CNN
+	1    10000 4700
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C78
+L stmbl:C C78
 U 1 1 5663136E
-P 9600 850
-F 0 "C78" H 9625 950 50  0000 L CNN
-F 1 "100n" H 9625 750 50  0000 L CNN
-F 2 "stmbl:C_0603" H 9638 700 30  0001 C CNN
-F 3 "" H 9600 850 60  0000 C CNN
-F 4 "" H 9600 850 60  0001 C CNN "InternalName"
-F 5 "" H 9600 850 60  0001 C CNN "Manufacturer No"
-F 6 "50V" H 9600 850 60  0001 C CNN "Voltage"
-F 7 "" H 9600 850 60  0001 C CNN "Source"
-F 8 "X7R" H 9600 850 60  0001 C CNN "Tolerance"
-	1    9600 850 
+P 9700 950
+F 0 "C78" H 9725 1050 50  0000 L CNN
+F 1 "100n" H 9725 850 50  0000 L CNN
+F 2 "stmbl:C_0603" H 9738 800 30  0001 C CNN
+F 3 "" H 9700 950 60  0000 C CNN
+F 4 "" H 9700 950 60  0001 C CNN "InternalName"
+F 5 "" H 9700 950 60  0001 C CNN "Manufacturer No"
+F 6 "50V" H 9700 950 60  0001 C CNN "Voltage"
+F 7 "" H 9700 950 60  0001 C CNN "Source"
+F 8 "X7R" H 9700 950 60  0001 C CNN "Tolerance"
+	1    9700 950 
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR013
+L stmbl:GNDPWR #PWR013
 U 1 1 566314BF
-P 9300 700
-F 0 "#PWR013" H 9300 500 50  0001 C CNN
-F 1 "GNDPWR" H 9300 570 50  0000 C CNN
-F 2 "" H 9300 650 60  0000 C CNN
-F 3 "" H 9300 650 60  0000 C CNN
-	1    9300 700 
+P 9400 800
+F 0 "#PWR013" H 9400 600 50  0001 C CNN
+F 1 "GNDPWR" H 9400 670 50  0000 C CNN
+F 2 "" H 9400 750 60  0000 C CNN
+F 3 "" H 9400 750 60  0000 C CNN
+	1    9400 800 
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3VP #PWR014
+L stmbl:+3.3VP #PWR014
 U 1 1 566314F4
-P 9300 1000
-F 0 "#PWR014" H 9450 950 50  0001 C CNN
-F 1 "+3.3VP" H 9300 1100 50  0000 C CNN
-F 2 "" H 9300 1000 60  0000 C CNN
-F 3 "" H 9300 1000 60  0000 C CNN
-	1    9300 1000
+P 9400 1100
+F 0 "#PWR014" H 9550 1050 50  0001 C CNN
+F 1 "+3.3VP" H 9400 1200 50  0000 C CNN
+F 2 "" H 9400 1100 60  0000 C CNN
+F 3 "" H 9400 1100 60  0000 C CNN
+	1    9400 1100
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C79
+L stmbl:C C79
 U 1 1 56631543
-P 9700 850
-F 0 "C79" H 9725 950 50  0000 L CNN
-F 1 "100n" H 9725 750 50  0000 L CNN
-F 2 "stmbl:C_0603" H 9738 700 30  0001 C CNN
-F 3 "" H 9700 850 60  0000 C CNN
-F 4 "" H 9700 850 60  0001 C CNN "InternalName"
-F 5 "" H 9700 850 60  0001 C CNN "Manufacturer No"
-F 6 "50V" H 9700 850 60  0001 C CNN "Voltage"
-F 7 "" H 9700 850 60  0001 C CNN "Source"
-F 8 "X7R" H 9700 850 60  0001 C CNN "Tolerance"
-	1    9700 850 
+P 9800 950
+F 0 "C79" H 9825 1050 50  0000 L CNN
+F 1 "100n" H 9825 850 50  0000 L CNN
+F 2 "stmbl:C_0603" H 9838 800 30  0001 C CNN
+F 3 "" H 9800 950 60  0000 C CNN
+F 4 "" H 9800 950 60  0001 C CNN "InternalName"
+F 5 "" H 9800 950 60  0001 C CNN "Manufacturer No"
+F 6 "50V" H 9800 950 60  0001 C CNN "Voltage"
+F 7 "" H 9800 950 60  0001 C CNN "Source"
+F 8 "X7R" H 9800 950 60  0001 C CNN "Tolerance"
+	1    9800 950 
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C82
+L stmbl:C C82
 U 1 1 5663155A
-P 9800 850
-F 0 "C82" H 9825 950 50  0000 L CNN
-F 1 "100n" H 9825 750 50  0000 L CNN
-F 2 "stmbl:C_0603" H 9838 700 30  0001 C CNN
-F 3 "" H 9800 850 60  0000 C CNN
-F 4 "" H 9800 850 60  0001 C CNN "InternalName"
-F 5 "" H 9800 850 60  0001 C CNN "Manufacturer No"
-F 6 "50V" H 9800 850 60  0001 C CNN "Voltage"
-F 7 "" H 9800 850 60  0001 C CNN "Source"
-F 8 "X7R" H 9800 850 60  0001 C CNN "Tolerance"
-	1    9800 850 
+P 9900 950
+F 0 "C82" H 9925 1050 50  0000 L CNN
+F 1 "100n" H 9925 850 50  0000 L CNN
+F 2 "stmbl:C_0603" H 9938 800 30  0001 C CNN
+F 3 "" H 9900 950 60  0000 C CNN
+F 4 "" H 9900 950 60  0001 C CNN "InternalName"
+F 5 "" H 9900 950 60  0001 C CNN "Manufacturer No"
+F 6 "50V" H 9900 950 60  0001 C CNN "Voltage"
+F 7 "" H 9900 950 60  0001 C CNN "Source"
+F 8 "X7R" H 9900 950 60  0001 C CNN "Tolerance"
+	1    9900 950 
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C83
+L stmbl:C C83
 U 1 1 56631574
-P 9900 850
-F 0 "C83" H 9925 950 50  0000 L CNN
-F 1 "100n" H 9925 750 50  0000 L CNN
-F 2 "stmbl:C_0603" H 9938 700 30  0001 C CNN
-F 3 "" H 9900 850 60  0000 C CNN
-F 4 "" H 9900 850 60  0001 C CNN "InternalName"
-F 5 "" H 9900 850 60  0001 C CNN "Manufacturer No"
-F 6 "50V" H 9900 850 60  0001 C CNN "Voltage"
-F 7 "" H 9900 850 60  0001 C CNN "Source"
-F 8 "X7R" H 9900 850 60  0001 C CNN "Tolerance"
-	1    9900 850 
+P 10000 950
+F 0 "C83" H 10025 1050 50  0000 L CNN
+F 1 "100n" H 10025 850 50  0000 L CNN
+F 2 "stmbl:C_0603" H 10038 800 30  0001 C CNN
+F 3 "" H 10000 950 60  0000 C CNN
+F 4 "" H 10000 950 60  0001 C CNN "InternalName"
+F 5 "" H 10000 950 60  0001 C CNN "Manufacturer No"
+F 6 "50V" H 10000 950 60  0001 C CNN "Voltage"
+F 7 "" H 10000 950 60  0001 C CNN "Source"
+F 8 "X7R" H 10000 950 60  0001 C CNN "Tolerance"
+	1    10000 950 
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:Crystal Y1
+L stmbl:Crystal Y1
 U 1 1 56631593
-P 1900 2250
-F 0 "Y1" H 1900 2400 50  0000 C CNN
-F 1 "8M" H 1900 2100 50  0000 C CNN
-F 2 "stmbl:Crystal_SMD_0503_4Pads" H 1900 2250 60  0001 C CNN
-F 3 "" H 1900 2250 60  0000 C CNN
-F 4 "" H 1900 2250 60  0001 C CNN "InternalName"
-F 5 "ABM3B-8.000MHZ-10-1UT" H 1900 2250 60  0001 C CNN "Manufacturer No"
-F 6 "" H 1900 2250 60  0001 C CNN "Voltage"
-F 7 "https://de.aliexpress.com/item/1LOT-10PCS-Crystal-8MHZ-20PF-20PPM-4P-5032-SeriesYSX531SL/32534814045.html" H 1900 2250 60  0001 C CNN "Source"
-F 8 "" H 1900 2250 60  0001 C CNN "Tolerance"
-	1    1900 2250
+P 8600 2150
+F 0 "Y1" H 8600 2300 50  0000 C CNN
+F 1 "8M" H 8600 2000 50  0000 C CNN
+F 2 "stmbl:Crystal_SMD_0503_4Pads" H 8600 2150 60  0001 C CNN
+F 3 "" H 8600 2150 60  0000 C CNN
+F 4 "" H 8600 2150 60  0001 C CNN "InternalName"
+F 5 "ABM3B-8.000MHZ-10-1UT" H 8600 2150 60  0001 C CNN "Manufacturer No"
+F 6 "" H 8600 2150 60  0001 C CNN "Voltage"
+F 7 "https://de.aliexpress.com/item/1LOT-10PCS-Crystal-8MHZ-20PF-20PPM-4P-5032-SeriesYSX531SL/32534814045.html" H 8600 2150 60  0001 C CNN "Source"
+F 8 "" H 8600 2150 60  0001 C CNN "Tolerance"
+	1    8600 2150
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR015
+L stmbl:GNDPWR #PWR015
 U 1 1 566315E8
-P 1400 2100
-F 0 "#PWR015" H 1400 1900 50  0001 C CNN
-F 1 "GNDPWR" H 1400 1970 50  0000 C CNN
-F 2 "" H 1400 2050 60  0000 C CNN
-F 3 "" H 1400 2050 60  0000 C CNN
-	1    1400 2100
+P 8100 2000
+F 0 "#PWR015" H 8100 1800 50  0001 C CNN
+F 1 "GNDPWR" H 8100 1870 50  0000 C CNN
+F 2 "" H 8100 1950 60  0000 C CNN
+F 3 "" H 8100 1950 60  0000 C CNN
+	1    8100 2000
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C5
+L stmbl:C C5
 U 1 1 56631605
-P 1650 2100
-F 0 "C5" H 1675 2200 50  0000 L CNN
-F 1 "18p" H 1675 2000 50  0000 L CNN
-F 2 "stmbl:C_0603" H 1688 1950 30  0001 C CNN
-F 3 "" H 1650 2100 60  0000 C CNN
-F 4 "" H 1650 2100 60  0001 C CNN "InternalName"
-F 5 "" H 1650 2100 60  0001 C CNN "Manufacturer No"
-F 6 "50V" H 1650 2100 60  0001 C CNN "Voltage"
-F 7 "" H 1650 2100 60  0001 C CNN "Source"
-F 8 "X7R" H 1650 2100 60  0001 C CNN "Tolerance"
-	1    1650 2100
+P 8350 2000
+F 0 "C5" H 8375 2100 50  0000 L CNN
+F 1 "18p" H 8375 1900 50  0000 L CNN
+F 2 "stmbl:C_0603" H 8388 1850 30  0001 C CNN
+F 3 "" H 8350 2000 60  0000 C CNN
+F 4 "" H 8350 2000 60  0001 C CNN "InternalName"
+F 5 "" H 8350 2000 60  0001 C CNN "Manufacturer No"
+F 6 "50V" H 8350 2000 60  0001 C CNN "Voltage"
+F 7 "" H 8350 2000 60  0001 C CNN "Source"
+F 8 "X7R" H 8350 2000 60  0001 C CNN "Tolerance"
+	1    8350 2000
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR016
+L stmbl:GNDPWR #PWR016
 U 1 1 5663163A
-P 1400 2400
-F 0 "#PWR016" H 1400 2200 50  0001 C CNN
-F 1 "GNDPWR" H 1400 2270 50  0000 C CNN
-F 2 "" H 1400 2350 60  0000 C CNN
-F 3 "" H 1400 2350 60  0000 C CNN
-	1    1400 2400
+P 8100 2300
+F 0 "#PWR016" H 8100 2100 50  0001 C CNN
+F 1 "GNDPWR" H 8100 2170 50  0000 C CNN
+F 2 "" H 8100 2250 60  0000 C CNN
+F 3 "" H 8100 2250 60  0000 C CNN
+	1    8100 2300
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C6
+L stmbl:C C6
 U 1 1 566316C7
-P 1650 2400
-F 0 "C6" H 1675 2500 50  0000 L CNN
-F 1 "18p" H 1675 2300 50  0000 L CNN
-F 2 "stmbl:C_0603" H 1688 2250 30  0001 C CNN
-F 3 "" H 1650 2400 60  0000 C CNN
-F 4 "" H 1650 2400 60  0001 C CNN "InternalName"
-F 5 "" H 1650 2400 60  0001 C CNN "Manufacturer No"
-F 6 "50V" H 1650 2400 60  0001 C CNN "Voltage"
-F 7 "" H 1650 2400 60  0001 C CNN "Source"
-F 8 "X7R" H 1650 2400 60  0001 C CNN "Tolerance"
-	1    1650 2400
+P 8350 2300
+F 0 "C6" H 8375 2400 50  0000 L CNN
+F 1 "18p" H 8375 2200 50  0000 L CNN
+F 2 "stmbl:C_0603" H 8388 2150 30  0001 C CNN
+F 3 "" H 8350 2300 60  0000 C CNN
+F 4 "" H 8350 2300 60  0001 C CNN "InternalName"
+F 5 "" H 8350 2300 60  0001 C CNN "Manufacturer No"
+F 6 "50V" H 8350 2300 60  0001 C CNN "Voltage"
+F 7 "" H 8350 2300 60  0001 C CNN "Source"
+F 8 "X7R" H 8350 2300 60  0001 C CNN "Tolerance"
+	1    8350 2300
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C2
+L stmbl:C C2
 U 1 1 566317E6
-P 1100 2250
-F 0 "C2" H 1125 2350 50  0000 L CNN
-F 1 "100n" H 1125 2150 50  0000 L CNN
-F 2 "stmbl:C_0603" H 1138 2100 30  0001 C CNN
-F 3 "" H 1100 2250 60  0000 C CNN
-F 4 "" H 1100 2250 60  0001 C CNN "InternalName"
-F 5 "" H 1100 2250 60  0001 C CNN "Manufacturer No"
-F 6 "50V" H 1100 2250 60  0001 C CNN "Voltage"
-F 7 "" H 1100 2250 60  0001 C CNN "Source"
-F 8 "X7R" H 1100 2250 60  0001 C CNN "Tolerance"
-	1    1100 2250
+P 7800 2150
+F 0 "C2" H 7825 2250 50  0000 L CNN
+F 1 "100n" H 7825 2050 50  0000 L CNN
+F 2 "stmbl:C_0603" H 7838 2000 30  0001 C CNN
+F 3 "" H 7800 2150 60  0000 C CNN
+F 4 "" H 7800 2150 60  0001 C CNN "InternalName"
+F 5 "" H 7800 2150 60  0001 C CNN "Manufacturer No"
+F 6 "50V" H 7800 2150 60  0001 C CNN "Voltage"
+F 7 "" H 7800 2150 60  0001 C CNN "Source"
+F 8 "X7R" H 7800 2150 60  0001 C CNN "Tolerance"
+	1    7800 2150
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR017
+L stmbl:GNDPWR #PWR017
 U 1 1 56631848
-P 1100 2500
-F 0 "#PWR017" H 1100 2300 50  0001 C CNN
-F 1 "GNDPWR" H 1100 2370 50  0000 C CNN
-F 2 "" H 1100 2450 60  0000 C CNN
-F 3 "" H 1100 2450 60  0000 C CNN
-	1    1100 2500
+P 7800 2400
+F 0 "#PWR017" H 7800 2200 50  0001 C CNN
+F 1 "GNDPWR" H 7800 2270 50  0000 C CNN
+F 2 "" H 7800 2350 60  0000 C CNN
+F 3 "" H 7800 2350 60  0000 C CNN
+	1    7800 2400
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3VP #PWR018
+L stmbl:+3.3VP #PWR018
 U 1 1 56631891
-P 1100 1900
-F 0 "#PWR018" H 1250 1850 50  0001 C CNN
-F 1 "+3.3VP" H 1100 2000 50  0000 C CNN
-F 2 "" H 1100 1900 60  0000 C CNN
-F 3 "" H 1100 1900 60  0000 C CNN
-	1    1100 1900
+P 7800 1800
+F 0 "#PWR018" H 7950 1750 50  0001 C CNN
+F 1 "+3.3VP" H 7800 1900 50  0000 C CNN
+F 2 "" H 7800 1800 60  0000 C CNN
+F 3 "" H 7800 1800 60  0000 C CNN
+	1    7800 1800
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C7
+L stmbl:C C7
 U 1 1 56631C3B
-P 2150 1600
-F 0 "C7" H 2175 1700 50  0000 L CNN
-F 1 "100n" H 2175 1500 50  0000 L CNN
-F 2 "stmbl:C_0603" H 2188 1450 30  0001 C CNN
-F 3 "" H 2150 1600 60  0000 C CNN
-F 4 "" H 2150 1600 60  0001 C CNN "InternalName"
-F 5 "" H 2150 1600 60  0001 C CNN "Manufacturer No"
-F 6 "50V" H 2150 1600 60  0001 C CNN "Voltage"
-F 7 "" H 2150 1600 60  0001 C CNN "Source"
-F 8 "X7R" H 2150 1600 60  0001 C CNN "Tolerance"
-	1    2150 1600
+P 8850 1500
+F 0 "C7" H 8875 1600 50  0000 L CNN
+F 1 "100n" H 8875 1400 50  0000 L CNN
+F 2 "stmbl:C_0603" H 8888 1350 30  0001 C CNN
+F 3 "" H 8850 1500 60  0000 C CNN
+F 4 "" H 8850 1500 60  0001 C CNN "InternalName"
+F 5 "" H 8850 1500 60  0001 C CNN "Manufacturer No"
+F 6 "50V" H 8850 1500 60  0001 C CNN "Voltage"
+F 7 "" H 8850 1500 60  0001 C CNN "Source"
+F 8 "X7R" H 8850 1500 60  0001 C CNN "Tolerance"
+	1    8850 1500
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR019
+L stmbl:GNDPWR #PWR019
 U 1 1 56631CB6
-P 1900 1600
-F 0 "#PWR019" H 1900 1400 50  0001 C CNN
-F 1 "GNDPWR" H 1900 1470 50  0000 C CNN
-F 2 "" H 1900 1550 60  0000 C CNN
-F 3 "" H 1900 1550 60  0000 C CNN
-	1    1900 1600
+P 8600 1500
+F 0 "#PWR019" H 8600 1300 50  0001 C CNN
+F 1 "GNDPWR" H 8600 1370 50  0000 C CNN
+F 2 "" H 8600 1450 60  0000 C CNN
+F 3 "" H 8600 1450 60  0000 C CNN
+	1    8600 1500
 	0    1    1    0   
 $EndComp
-Text HLabel 2400 3800 0    60   Input ~ 0
+Text HLabel 9100 3700 0    60   Input ~ 0
 T8_CH3
-Text HLabel 2400 3700 0    60   Input ~ 0
+Text HLabel 9100 3600 0    60   Input ~ 0
 T8_CH2
-Text HLabel 2400 3500 0    60   Input ~ 0
+Text HLabel 9100 3400 0    60   Input ~ 0
 T8_CH1
-Text HLabel 2400 3400 0    60   Input ~ 0
+Text HLabel 9100 3300 0    60   Input ~ 0
 T8_CH3N
-Text HLabel 2400 3300 0    60   Input ~ 0
+Text HLabel 9100 3200 0    60   Input ~ 0
 T8_CH2N
-Text HLabel 2400 3200 0    60   Input ~ 0
+Text HLabel 9100 3100 0    60   Input ~ 0
 T8_CH1N
-Text HLabel 2400 3900 0    60   Input ~ 0
+Text HLabel 9100 3800 0    60   Input ~ 0
 HV_TX
-Text HLabel 2400 4000 0    60   Input ~ 0
+Text HLabel 9100 3900 0    60   Input ~ 0
 HV_RX
 $Comp
-L stmbl1:CONN_01X04 P12
+L stmbl:CONN_01X04 P12
 U 1 1 5663248E
-P 18350 4250
-F 0 "P12" H 18350 4500 50  0000 C CNN
-F 1 "CONN_01X04" V 18450 4250 50  0000 C CNN
-F 2 "stmbl:Pin_Header_Straight_1x04" H 18350 4250 60  0001 C CNN
-F 3 "" H 18350 4250 60  0000 C CNN
-F 4 "" H 18350 4250 60  0001 C CNN "InternalName"
-F 5 "" H 18350 4250 60  0001 C CNN "Manufacturer No"
-F 6 "" H 18350 4250 60  0001 C CNN "Voltage"
-F 7 "" H 18350 4250 60  0001 C CNN "Source"
-F 8 "" H 18350 4250 60  0001 C CNN "Tolerance"
-	1    18350 4250
+P 11650 4150
+F 0 "P12" H 11650 4400 50  0000 C CNN
+F 1 "CONN_01X04" V 11750 4150 50  0000 C CNN
+F 2 "stmbl:Pin_Header_Straight_1x04" H 11650 4150 60  0001 C CNN
+F 3 "" H 11650 4150 60  0000 C CNN
+F 4 "" H 11650 4150 60  0001 C CNN "InternalName"
+F 5 "" H 11650 4150 60  0001 C CNN "Manufacturer No"
+F 6 "" H 11650 4150 60  0001 C CNN "Voltage"
+F 7 "" H 11650 4150 60  0001 C CNN "Source"
+F 8 "" H 11650 4150 60  0001 C CNN "Tolerance"
+	1    11650 4150
 	1    0    0    1   
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR020
+L stmbl:GNDPWR #PWR020
 U 1 1 566325FB
-P 17800 4300
-F 0 "#PWR020" H 17800 4100 50  0001 C CNN
-F 1 "GNDPWR" H 17800 4170 50  0000 C CNN
-F 2 "" H 17800 4250 60  0000 C CNN
-F 3 "" H 17800 4250 60  0000 C CNN
-	1    17800 4300
+P 11100 4200
+F 0 "#PWR020" H 11100 4000 50  0001 C CNN
+F 1 "GNDPWR" H 11100 4070 50  0000 C CNN
+F 2 "" H 11100 4150 60  0000 C CNN
+F 3 "" H 11100 4150 60  0000 C CNN
+	1    11100 4200
 	0    1    1    0   
 $EndComp
-Text HLabel 2350 4100 0    60   Input ~ 0
+Text HLabel 9050 4000 0    60   Input ~ 0
 A_HV
-Text HLabel 2350 4200 0    60   Input ~ 0
+Text HLabel 9050 4100 0    60   Input ~ 0
 A_U
-Text HLabel 17250 3400 2    60   Input ~ 0
+Text HLabel 10550 3300 2    60   Input ~ 0
 A_V
-Text HLabel 17250 3200 2    60   Input ~ 0
+Text HLabel 10550 3100 2    60   Input ~ 0
 A_W
-Text HLabel 2350 4300 0    60   Input ~ 0
+Text HLabel 9050 4200 0    60   Input ~ 0
 A_T_HV
 $Comp
-L stmbl1:R R2
+L stmbl:R R2
 U 1 1 566A7D18
-P 800 2050
-F 0 "R2" V 880 2050 50  0000 C CNN
-F 1 "1k" V 800 2050 50  0000 C CNN
-F 2 "stmbl:R_0603" V 730 2050 30  0001 C CNN
-F 3 "" H 800 2050 30  0000 C CNN
-F 4 "" H 800 2050 30  0001 C CNN "InternalName"
-F 5 "" H 800 2050 30  0001 C CNN "Manufacturer No"
-F 6 "" H 800 2050 30  0001 C CNN "Voltage"
-F 7 "" H 800 2050 30  0001 C CNN "Source"
-F 8 "1%" H 800 2050 30  0001 C CNN "Tolerance"
-	1    800  2050
+P 7500 1950
+F 0 "R2" V 7580 1950 50  0000 C CNN
+F 1 "1k" V 7500 1950 50  0000 C CNN
+F 2 "stmbl:R_0603" V 7430 1950 30  0001 C CNN
+F 3 "" H 7500 1950 30  0000 C CNN
+F 4 "" H 7500 1950 30  0001 C CNN "InternalName"
+F 5 "" H 7500 1950 30  0001 C CNN "Manufacturer No"
+F 6 "" H 7500 1950 30  0001 C CNN "Voltage"
+F 7 "" H 7500 1950 30  0001 C CNN "Source"
+F 8 "1%" H 7500 1950 30  0001 C CNN "Tolerance"
+	1    7500 1950
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR021
+L stmbl:GNDPWR #PWR021
 U 1 1 566A7E7E
-P 800 2300
-F 0 "#PWR021" H 800 2100 50  0001 C CNN
-F 1 "GNDPWR" H 800 2170 50  0000 C CNN
-F 2 "" H 800 2250 60  0000 C CNN
-F 3 "" H 800 2250 60  0000 C CNN
-	1    800  2300
+P 7500 2200
+F 0 "#PWR021" H 7500 2000 50  0001 C CNN
+F 1 "GNDPWR" H 7500 2070 50  0000 C CNN
+F 2 "" H 7500 2150 60  0000 C CNN
+F 3 "" H 7500 2150 60  0000 C CNN
+	1    7500 2200
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3VP #PWR022
+L stmbl:+3.3VP #PWR022
 U 1 1 566A7F0A
-P 800 1400
-F 0 "#PWR022" H 950 1350 50  0001 C CNN
-F 1 "+3.3VP" H 800 1500 50  0000 C CNN
-F 2 "" H 800 1400 60  0000 C CNN
-F 3 "" H 800 1400 60  0000 C CNN
-	1    800  1400
+P 7500 1300
+F 0 "#PWR022" H 7650 1250 50  0001 C CNN
+F 1 "+3.3VP" H 7500 1400 50  0000 C CNN
+F 2 "" H 7500 1300 60  0000 C CNN
+F 3 "" H 7500 1300 60  0000 C CNN
+	1    7500 1300
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:Jumper_NO_Small JP1
+L stmbl:Jumper_NO_Small JP1
 U 1 1 566A7FD4
-P 800 1600
-F 0 "JP1" H 800 1680 50  0000 C CNN
-F 1 "Jumper_NO_Small" H 810 1540 50  0001 C CNN
-F 2 "stmbl:SOLDER_JUMPER" H 800 1600 60  0001 C CNN
-F 3 "" H 800 1600 60  0000 C CNN
-F 4 "" H 800 1600 60  0001 C CNN "InternalName"
-F 5 "" H 800 1600 60  0001 C CNN "Manufacturer No"
-F 6 "" H 800 1600 60  0001 C CNN "Voltage"
-F 7 "" H 800 1600 60  0001 C CNN "Source"
-F 8 "" H 800 1600 60  0001 C CNN "Tolerance"
-	1    800  1600
+P 7500 1500
+F 0 "JP1" H 7500 1580 50  0000 C CNN
+F 1 "Jumper_NO_Small" H 7510 1440 50  0001 C CNN
+F 2 "stmbl:SOLDER_JUMPER" H 7500 1500 60  0001 C CNN
+F 3 "" H 7500 1500 60  0000 C CNN
+F 4 "" H 7500 1500 60  0001 C CNN "InternalName"
+F 5 "" H 7500 1500 60  0001 C CNN "Manufacturer No"
+F 6 "" H 7500 1500 60  0001 C CNN "Voltage"
+F 7 "" H 7500 1500 60  0001 C CNN "Source"
+F 8 "" H 7500 1500 60  0001 C CNN "Tolerance"
+	1    7500 1500
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:USBLC6-4SC6 U21
+L stmbl:USBLC6-4SC6 U21
 U 1 1 56820F0C
 P 9400 6600
 F 0 "U21" H 8701 6948 50  0000 C CNN
@@ -370,7 +370,7 @@ F 8 "TRANSIENT VOLTAGE SUPPRESSOR" H 9400 6350 50  0000 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR023
+L stmbl:GNDPWR #PWR023
 U 1 1 56821409
 P 8250 6800
 F 0 "#PWR023" H 8250 6600 50  0001 C CNN
@@ -381,7 +381,7 @@ F 3 "" H 8250 6750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3VP #PWR024
+L stmbl:+3.3VP #PWR024
 U 1 1 56821444
 P 10550 6400
 F 0 "#PWR024" H 10700 6350 50  0001 C CNN
@@ -392,12 +392,12 @@ F 3 "" H 10550 6400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl_4.0-rescue:STM32F303CBTx-RESCUE-stmbl_4.0 U25
+L stmbl:STM32F303CBTx U25
 U 1 1 570DA682
 P 9800 3000
-F 0 "U25" H 2650 4750 50  0000 C CNN
-F 1 "STM32F303CBTx" H 16700 1250 50  0000 C CNN
-F 2 "stmbl:LQFP-48_7x7mm_Pitch0.5mm" H 2750 1250 50  0000 C CNN
+F 0 "U25" H 9800 2900 50  0000 C CNN
+F 1 "STM32F303CBTx" H 9900 3500 50  0000 C CNN
+F 2 "stmbl:LQFP-48_7x7mm_Pitch0.5mm" H 9900 3400 50  0000 C CNN
 F 3 "" H 9800 3000 50  0000 C CNN
 F 4 "" H 9800 3000 50  0001 C CNN "InternalName"
 F 5 "STM32F303CBT" H 9800 3000 50  0001 C CNN "Manufacturer No"
@@ -408,170 +408,170 @@ F 8 "" H 9800 3000 50  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R129
+L stmbl:R R129
 U 1 1 570E4A7D
-P 17450 4500
-F 0 "R129" V 17530 4500 50  0000 C CNN
-F 1 "1k" V 17450 4500 50  0000 C CNN
-F 2 "stmbl:R_0603" V 17380 4500 30  0001 C CNN
-F 3 "" H 17450 4500 30  0000 C CNN
-F 4 "" H 17450 4500 30  0001 C CNN "InternalName"
-F 5 "" H 17450 4500 30  0001 C CNN "Manufacturer No"
-F 6 "" H 17450 4500 30  0001 C CNN "Voltage"
-F 7 "" H 17450 4500 30  0001 C CNN "Source"
-F 8 "1%" H 17450 4500 30  0001 C CNN "Tolerance"
-	1    17450 4500
+P 10750 4400
+F 0 "R129" V 10830 4400 50  0000 C CNN
+F 1 "1k" V 10750 4400 50  0000 C CNN
+F 2 "stmbl:R_0603" V 10680 4400 30  0001 C CNN
+F 3 "" H 10750 4400 30  0000 C CNN
+F 4 "" H 10750 4400 30  0001 C CNN "InternalName"
+F 5 "" H 10750 4400 30  0001 C CNN "Manufacturer No"
+F 6 "" H 10750 4400 30  0001 C CNN "Voltage"
+F 7 "" H 10750 4400 30  0001 C CNN "Source"
+F 8 "1%" H 10750 4400 30  0001 C CNN "Tolerance"
+	1    10750 4400
 	0    1    1    0   
 $EndComp
-Text HLabel 17200 3000 2    60   Input ~ 0
+Text HLabel 10500 2900 2    60   Input ~ 0
 A_IW
-Text HLabel 2400 2900 0    60   Input ~ 0
+Text HLabel 9100 2800 0    60   Input ~ 0
 A_IV
-Text HLabel 17200 3600 2    60   Input ~ 0
+Text HLabel 10500 3500 2    60   Input ~ 0
 A_IU
 $Comp
-L stmbl1:testpoint T45
+L stmbl:testpoint T45
 U 1 1 57750CEC
-P 17950 3300
-F 0 "T45" H 17950 3400 60  0000 C CNN
-F 1 "testpoint" H 17950 3200 60  0000 C CNN
-F 2 "stmbl:Measurement_Point_Round-SMD-Pad_Small" H 17950 3300 60  0001 C CNN
-F 3 "" H 17950 3300 60  0000 C CNN
-F 4 "" H 17950 3300 60  0001 C CNN "InternalName"
-F 5 "" H 17950 3300 60  0001 C CNN "Manufacturer No"
-F 6 "" H 17950 3300 60  0001 C CNN "Voltage"
-F 7 "" H 17950 3300 60  0001 C CNN "Source"
-F 8 "" H 17950 3300 60  0001 C CNN "Tolerance"
-	1    17950 3300
+P 11250 3200
+F 0 "T45" H 11250 3300 60  0000 C CNN
+F 1 "testpoint" H 11250 3100 60  0000 C CNN
+F 2 "stmbl:Measurement_Point_Round-SMD-Pad_Small" H 11250 3200 60  0001 C CNN
+F 3 "" H 11250 3200 60  0000 C CNN
+F 4 "" H 11250 3200 60  0001 C CNN "InternalName"
+F 5 "" H 11250 3200 60  0001 C CNN "Manufacturer No"
+F 6 "" H 11250 3200 60  0001 C CNN "Voltage"
+F 7 "" H 11250 3200 60  0001 C CNN "Source"
+F 8 "" H 11250 3200 60  0001 C CNN "Tolerance"
+	1    11250 3200
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:testpoint T44
+L stmbl:testpoint T44
 U 1 1 57751000
-P 17950 3100
-F 0 "T44" H 17950 3200 60  0000 C CNN
-F 1 "testpoint" H 17950 3000 60  0000 C CNN
-F 2 "stmbl:Measurement_Point_Round-SMD-Pad_Small" H 17950 3100 60  0001 C CNN
-F 3 "" H 17950 3100 60  0000 C CNN
-F 4 "" H 17950 3100 60  0001 C CNN "InternalName"
-F 5 "" H 17950 3100 60  0001 C CNN "Manufacturer No"
-F 6 "" H 17950 3100 60  0001 C CNN "Voltage"
-F 7 "" H 17950 3100 60  0001 C CNN "Source"
-F 8 "" H 17950 3100 60  0001 C CNN "Tolerance"
-	1    17950 3100
+P 11250 3000
+F 0 "T44" H 11250 3100 60  0000 C CNN
+F 1 "testpoint" H 11250 2900 60  0000 C CNN
+F 2 "stmbl:Measurement_Point_Round-SMD-Pad_Small" H 11250 3000 60  0001 C CNN
+F 3 "" H 11250 3000 60  0000 C CNN
+F 4 "" H 11250 3000 60  0001 C CNN "InternalName"
+F 5 "" H 11250 3000 60  0001 C CNN "Manufacturer No"
+F 6 "" H 11250 3000 60  0001 C CNN "Voltage"
+F 7 "" H 11250 3000 60  0001 C CNN "Source"
+F 8 "" H 11250 3000 60  0001 C CNN "Tolerance"
+	1    11250 3000
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:testpoint T46
+L stmbl:testpoint T46
 U 1 1 5775117B
-P 17950 3500
-F 0 "T46" H 17950 3600 60  0000 C CNN
-F 1 "testpoint" H 17950 3400 60  0000 C CNN
-F 2 "stmbl:Measurement_Point_Round-SMD-Pad_Small" H 17950 3500 60  0001 C CNN
-F 3 "" H 17950 3500 60  0000 C CNN
-F 4 "" H 17950 3500 60  0001 C CNN "InternalName"
-F 5 "" H 17950 3500 60  0001 C CNN "Manufacturer No"
-F 6 "" H 17950 3500 60  0001 C CNN "Voltage"
-F 7 "" H 17950 3500 60  0001 C CNN "Source"
-F 8 "" H 17950 3500 60  0001 C CNN "Tolerance"
-	1    17950 3500
+P 11250 3400
+F 0 "T46" H 11250 3500 60  0000 C CNN
+F 1 "testpoint" H 11250 3300 60  0000 C CNN
+F 2 "stmbl:Measurement_Point_Round-SMD-Pad_Small" H 11250 3400 60  0001 C CNN
+F 3 "" H 11250 3400 60  0000 C CNN
+F 4 "" H 11250 3400 60  0001 C CNN "InternalName"
+F 5 "" H 11250 3400 60  0001 C CNN "Manufacturer No"
+F 6 "" H 11250 3400 60  0001 C CNN "Voltage"
+F 7 "" H 11250 3400 60  0001 C CNN "Source"
+F 8 "" H 11250 3400 60  0001 C CNN "Tolerance"
+	1    11250 3400
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:testpoint T1
+L stmbl:testpoint T1
 U 1 1 57751F4A
-P 1700 3000
-F 0 "T1" H 1700 3100 60  0000 C CNN
-F 1 "testpoint" H 1700 2900 60  0000 C CNN
-F 2 "stmbl:Measurement_Point_Round-SMD-Pad_Small" H 1700 3000 60  0001 C CNN
-F 3 "" H 1700 3000 60  0000 C CNN
-F 4 "" H 1700 3000 60  0001 C CNN "InternalName"
-F 5 "" H 1700 3000 60  0001 C CNN "Manufacturer No"
-F 6 "" H 1700 3000 60  0001 C CNN "Voltage"
-F 7 "" H 1700 3000 60  0001 C CNN "Source"
-F 8 "" H 1700 3000 60  0001 C CNN "Tolerance"
-	1    1700 3000
+P 8400 2900
+F 0 "T1" H 8400 3000 60  0000 C CNN
+F 1 "testpoint" H 8400 2800 60  0000 C CNN
+F 2 "stmbl:Measurement_Point_Round-SMD-Pad_Small" H 8400 2900 60  0001 C CNN
+F 3 "" H 8400 2900 60  0000 C CNN
+F 4 "" H 8400 2900 60  0001 C CNN "InternalName"
+F 5 "" H 8400 2900 60  0001 C CNN "Manufacturer No"
+F 6 "" H 8400 2900 60  0001 C CNN "Voltage"
+F 7 "" H 8400 2900 60  0001 C CNN "Source"
+F 8 "" H 8400 2900 60  0001 C CNN "Tolerance"
+	1    8400 2900
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:LED D1
+L stmbl:LED D1
 U 1 1 5776010E
-P 17600 3700
-F 0 "D1" H 17600 3800 50  0000 C CNN
-F 1 "red" H 17600 3600 50  0000 C CNN
-F 2 "stmbl:LED-0805-SIDE" H 17600 3700 50  0001 C CNN
-F 3 "" H 17600 3700 50  0000 C CNN
-F 4 "" H 17600 3700 50  0001 C CNN "InternalName"
-F 5 "LTST-S220KRKT" H 17600 3700 50  0001 C CNN "Manufacturer No"
-F 6 "" H 17600 3700 50  0001 C CNN "Voltage"
-F 7 "" H 17600 3700 50  0001 C CNN "Source"
-F 8 "" H 17600 3700 50  0001 C CNN "Tolerance"
-	1    17600 3700
+P 10900 3600
+F 0 "D1" H 10900 3700 50  0000 C CNN
+F 1 "red" H 10900 3500 50  0000 C CNN
+F 2 "stmbl:LED-0805-SIDE" H 10900 3600 50  0001 C CNN
+F 3 "" H 10900 3600 50  0000 C CNN
+F 4 "" H 10900 3600 50  0001 C CNN "InternalName"
+F 5 "LTST-S220KRKT" H 10900 3600 50  0001 C CNN "Manufacturer No"
+F 6 "" H 10900 3600 50  0001 C CNN "Voltage"
+F 7 "" H 10900 3600 50  0001 C CNN "Source"
+F 8 "" H 10900 3600 50  0001 C CNN "Tolerance"
+	1    10900 3600
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:R R8
+L stmbl:R R8
 U 1 1 57760220
-P 18050 3700
-F 0 "R8" V 18130 3700 50  0000 C CNN
-F 1 "470" V 18050 3700 50  0000 C CNN
-F 2 "stmbl:R_0603" V 17980 3700 30  0001 C CNN
-F 3 "" H 18050 3700 30  0000 C CNN
-F 4 "" H 18050 3700 30  0001 C CNN "InternalName"
-F 5 "" H 18050 3700 30  0001 C CNN "Manufacturer No"
-F 6 "" H 18050 3700 30  0001 C CNN "Voltage"
-F 7 "" H 18050 3700 30  0001 C CNN "Source"
-F 8 "1%" H 18050 3700 30  0001 C CNN "Tolerance"
-	1    18050 3700
+P 11350 3600
+F 0 "R8" V 11430 3600 50  0000 C CNN
+F 1 "470" V 11350 3600 50  0000 C CNN
+F 2 "stmbl:R_0603" V 11280 3600 30  0001 C CNN
+F 3 "" H 11350 3600 30  0000 C CNN
+F 4 "" H 11350 3600 30  0001 C CNN "InternalName"
+F 5 "" H 11350 3600 30  0001 C CNN "Manufacturer No"
+F 6 "" H 11350 3600 30  0001 C CNN "Voltage"
+F 7 "" H 11350 3600 30  0001 C CNN "Source"
+F 8 "1%" H 11350 3600 30  0001 C CNN "Tolerance"
+	1    11350 3600
 	0    1    1    0   
 $EndComp
-Text Notes 10950 1200 0    60   ~ 0
+Text Notes 11050 1300 0    60   ~ 0
 Cube: 3.3V 72MHz 50mA
 $Comp
-L stmbl1:INDUCTOR L1
+L stmbl:INDUCTOR L1
 U 1 1 57B2E566
-P 10500 1100
-F 0 "L1" V 10450 1100 50  0000 C CNN
-F 1 "220r 700mA" V 10600 1100 50  0000 C CNN
-F 2 "stmbl:R_0603" H 10500 1100 50  0001 C CNN
-F 3 "" H 10500 1100 50  0000 C CNN
-F 4 "BLM18AG221SN1" H 10500 1100 50  0001 C CNN "Manufacturer No"
-F 5 "" H 10500 1100 50  0001 C CNN "Voltage"
-F 6 "https://de.aliexpress.com/item/500-PCS-LOT-patch-magnetic-bead-FB-BLM18AG221SN1-0603-220-r-0-5-A-magnetic-beads/32675343247.html" H 10500 1100 50  0001 C CNN "Source"
-F 7 "" H 10500 1100 50  0001 C CNN "InternalName"
-F 8 "" H 10500 1100 50  0001 C CNN "Tolerance"
-	1    10500 1100
+P 10600 1200
+F 0 "L1" V 10550 1200 50  0000 C CNN
+F 1 "220r 700mA" V 10700 1200 50  0000 C CNN
+F 2 "stmbl:R_0603" H 10600 1200 50  0001 C CNN
+F 3 "" H 10600 1200 50  0000 C CNN
+F 4 "BLM18AG221SN1" H 10600 1200 50  0001 C CNN "Manufacturer No"
+F 5 "" H 10600 1200 50  0001 C CNN "Voltage"
+F 6 "https://de.aliexpress.com/item/500-PCS-LOT-patch-magnetic-bead-FB-BLM18AG221SN1-0603-220-r-0-5-A-magnetic-beads/32675343247.html" H 10600 1200 50  0001 C CNN "Source"
+F 7 "" H 10600 1200 50  0001 C CNN "InternalName"
+F 8 "" H 10600 1200 50  0001 C CNN "Tolerance"
+	1    10600 1200
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:C C10
+L stmbl:C C10
 U 1 1 57B2E6B6
-P 10900 900
-F 0 "C10" H 10925 1000 50  0000 L CNN
-F 1 "100n" H 10925 800 50  0000 L CNN
-F 2 "stmbl:C_0603" H 10938 750 30  0001 C CNN
-F 3 "" H 10900 900 60  0000 C CNN
-F 4 "" H 10900 900 60  0001 C CNN "InternalName"
-F 5 "" H 10900 900 60  0001 C CNN "Manufacturer No"
-F 6 "50V" H 10900 900 60  0001 C CNN "Voltage"
-F 7 "" H 10900 900 60  0001 C CNN "Source"
-F 8 "X7R" H 10900 900 60  0001 C CNN "Tolerance"
-	1    10900 900 
+P 11000 1000
+F 0 "C10" H 11025 1100 50  0000 L CNN
+F 1 "100n" H 11025 900 50  0000 L CNN
+F 2 "stmbl:C_0603" H 11038 850 30  0001 C CNN
+F 3 "" H 11000 1000 60  0000 C CNN
+F 4 "" H 11000 1000 60  0001 C CNN "InternalName"
+F 5 "" H 11000 1000 60  0001 C CNN "Manufacturer No"
+F 6 "50V" H 11000 1000 60  0001 C CNN "Voltage"
+F 7 "" H 11000 1000 60  0001 C CNN "Source"
+F 8 "X7R" H 11000 1000 60  0001 C CNN "Tolerance"
+	1    11000 1000
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3VP #PWR025
+L stmbl:+3.3VP #PWR025
 U 1 1 57B2E8A4
-P 11200 1000
-F 0 "#PWR025" H 11350 950 50  0001 C CNN
-F 1 "+3.3VP" H 11200 1100 50  0000 C CNN
-F 2 "" H 11200 1000 60  0000 C CNN
-F 3 "" H 11200 1000 60  0000 C CNN
-	1    11200 1000
+P 11300 1100
+F 0 "#PWR025" H 11450 1050 50  0001 C CNN
+F 1 "+3.3VP" H 11300 1200 50  0000 C CNN
+F 2 "" H 11300 1100 60  0000 C CNN
+F 3 "" H 11300 1100 60  0000 C CNN
+	1    11300 1100
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C9
+L stmbl:C C9
 U 1 1 57B30D45
 P 7450 6600
 F 0 "C9" H 7475 6700 50  0000 L CNN
@@ -587,7 +587,7 @@ F 8 "X7R" H 7450 6600 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR026
+L stmbl:GNDPWR #PWR026
 U 1 1 57B30D4B
 P 7450 6850
 F 0 "#PWR026" H 7450 6650 50  0001 C CNN
@@ -598,7 +598,7 @@ F 3 "" H 7450 6800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3VP #PWR027
+L stmbl:+3.3VP #PWR027
 U 1 1 57B30D51
 P 7450 6350
 F 0 "#PWR027" H 7600 6300 50  0001 C CNN
@@ -608,10 +608,10 @@ F 3 "" H 7450 6350 60  0000 C CNN
 	1    7450 6350
 	1    0    0    -1  
 $EndComp
-Text HLabel 2350 4400 0    60   Input ~ 0
+Text HLabel 9050 4300 0    60   Input ~ 0
 A_T_MOT
 $Comp
-L stmbl1:USBLC6-4SC6 U29
+L stmbl:USBLC6-4SC6 U29
 U 1 1 57DEBE00
 P 4350 5650
 F 0 "U29" H 3651 5998 50  0000 C CNN
@@ -626,7 +626,7 @@ F 7 " " H 4350 5650 50  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C128
+L stmbl:C C128
 U 1 1 57DF402E
 P 4100 6500
 F 0 "C128" H 4125 6600 50  0000 L CNN
@@ -642,7 +642,7 @@ F 8 "X7R" H 4100 6500 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR028
+L stmbl:GNDPWR #PWR028
 U 1 1 57DF4034
 P 4100 6750
 F 0 "#PWR028" H 4100 6550 50  0001 C CNN
@@ -653,7 +653,7 @@ F 3 "" H 4100 6700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3VP #PWR029
+L stmbl:+3.3VP #PWR029
 U 1 1 57DF403A
 P 5500 5650
 F 0 "#PWR029" H 5650 5600 50  0001 C CNN
@@ -663,19 +663,19 @@ F 3 "" H 5500 5650 60  0000 C CNN
 	1    5500 5650
 	0    1    1    0   
 $EndComp
-Text HLabel 17200 4100 2    60   Input ~ 0
+Text HLabel 10500 4000 2    60   Input ~ 0
 USB_DP
-Text HLabel 17200 4000 2    60   Input ~ 0
+Text HLabel 10500 3900 2    60   Input ~ 0
 USB_DM
-Text HLabel 17700 4500 2    60   Input ~ 0
+Text HLabel 11000 4400 2    60   Input ~ 0
 HV_EN
-Text HLabel 2400 3600 0    60   Input ~ 0
+Text HLabel 9100 3500 0    60   Input ~ 0
 HV_FLT
-Text HLabel 18600 4100 2    60   Input ~ 0
+Text HLabel 11900 4000 2    60   Input ~ 0
 NRST
-Text HLabel 18600 4200 2    60   Input ~ 0
+Text HLabel 11900 4100 2    60   Input ~ 0
 SWDIO
-Text HLabel 18600 4400 2    60   Input ~ 0
+Text HLabel 11900 4300 2    60   Input ~ 0
 SWCLK
 Text HLabel 10650 6500 2    60   Input ~ 0
 NRST
@@ -692,14 +692,14 @@ IO_TX
 Text HLabel 5500 5750 2    60   Input ~ 0
 IO_RX
 $Comp
-L stmbl1:GNDPWR #PWR030
+L stmbl:GNDPWR #PWR030
 U 1 1 57F61589
-P 18300 3700
-F 0 "#PWR030" H 18300 3500 50  0001 C CNN
-F 1 "GNDPWR" H 18300 3570 50  0000 C CNN
-F 2 "" H 18300 3650 60  0000 C CNN
-F 3 "" H 18300 3650 60  0000 C CNN
-	1    18300 3700
+P 11600 3600
+F 0 "#PWR030" H 11600 3400 50  0001 C CNN
+F 1 "GNDPWR" H 11600 3470 50  0000 C CNN
+F 2 "" H 11600 3550 60  0000 C CNN
+F 3 "" H 11600 3550 60  0000 C CNN
+	1    11600 3600
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
@@ -717,126 +717,124 @@ Wire Wire Line
 Wire Wire Line
 	10450 6600 10550 6600
 Wire Wire Line
-	800  1500 800  1400
+	7500 1400 7500 1300
 Wire Wire Line
-	800  2200 800  2300
-Connection ~ 800  1800
+	7500 2100 7500 2200
+Connection ~ 7500 1700
 Wire Wire Line
-	800  1700 800  1800
+	7500 1600 7500 1700
 Wire Wire Line
-	800  1800 2500 1800
+	7500 1700 9200 1700
 Wire Wire Line
-	18050 4100 18150 4100
+	11350 4000 11450 4000
 Wire Wire Line
-	17100 4200 18150 4200
+	10400 4100 11450 4100
 Wire Wire Line
-	17450 4300 17100 4300
+	10750 4200 10400 4200
 Wire Wire Line
-	17450 4400 17450 4300
+	10750 4300 10750 4200
 Wire Wire Line
-	17450 4400 18150 4400
+	10750 4300 11450 4300
 Wire Wire Line
-	17800 4300 18150 4300
+	11100 4200 11450 4200
 Wire Wire Line
-	9900 4800 9900 4900
-Connection ~ 2400 1600
+	10000 4500 10000 4600
+Connection ~ 9100 1500
 Wire Wire Line
-	18050 500  18050 4100
+	11350 500  11350 4000
 Wire Wire Line
-	1900 1600 2000 1600
+	8600 1500 8700 1500
 Wire Wire Line
-	2300 1600 2400 1600
+	9000 1500 9100 1500
 Wire Wire Line
-	1100 2500 1100 2400
+	7800 2400 7800 2300
 Wire Wire Line
-	1100 1900 1100 2000
+	7800 1800 7800 1900
 Wire Wire Line
-	1100 2000 2500 2000
-Connection ~ 1900 2100
+	7800 1900 9200 1900
+Connection ~ 8600 2000
 Wire Wire Line
-	2400 2100 2400 2200
+	9100 2000 9100 2100
 Wire Wire Line
-	2400 2200 2500 2200
-Connection ~ 1900 2400
+	9100 2100 9200 2100
+Connection ~ 8600 2300
 Wire Wire Line
-	2400 2300 2500 2300
+	9100 2200 9200 2200
 Wire Wire Line
-	2400 2400 2400 2300
+	9100 2300 9100 2200
 Wire Wire Line
-	1800 2400 1900 2400
+	8500 2300 8600 2300
 Wire Wire Line
-	1800 2100 1900 2100
+	8500 2000 8600 2000
 Wire Wire Line
-	1400 2100 1500 2100
+	8100 2000 8200 2000
 Wire Wire Line
-	1400 2400 1500 2400
-Connection ~ 1100 2000
+	8100 2300 8200 2300
+Connection ~ 7800 1900
 Wire Wire Line
-	2400 500  2400 1600
+	9100 500  9100 1500
 Wire Wire Line
-	9600 1000 9600 1100
+	9700 1100 9700 1200
 Wire Wire Line
-	9800 1000 9800 1100
-Connection ~ 9800 1100
+	9900 1100 9900 1200
+Connection ~ 9900 1200
 Wire Wire Line
-	9700 1000 9700 1100
-Connection ~ 9700 1100
-Connection ~ 9600 1100
+	9800 1100 9800 1200
+Connection ~ 9800 1200
+Connection ~ 9700 1200
 Wire Wire Line
-	9600 700  9600 600 
+	9700 800  9700 700 
 Wire Wire Line
-	9800 600  9800 700 
-Connection ~ 9800 600 
+	9900 700  9900 800 
+Connection ~ 9900 700 
 Wire Wire Line
-	9700 600  9700 700 
-Connection ~ 9700 600 
+	9800 700  9800 800 
+Connection ~ 9800 700 
 Wire Wire Line
-	9300 700  9300 600 
-Connection ~ 9600 600 
+	9400 800  9400 700 
+Connection ~ 9700 700 
 Wire Wire Line
-	9600 4800 9600 4900
+	9700 4500 9700 4600
 Wire Wire Line
-	9600 4900 9700 4900
-Connection ~ 9900 4900
+	9700 4600 9800 4600
+Connection ~ 10000 4600
 Wire Wire Line
-	9700 4800 9700 4900
-Connection ~ 9700 4900
+	9800 4500 9800 4600
+Connection ~ 9800 4600
 Wire Wire Line
-	9800 4800 9800 4900
-Connection ~ 9800 4900
+	9900 4500 9900 4600
+Connection ~ 9900 4600
 Wire Wire Line
-	2400 500  18050 500 
+	11050 3200 10400 3200
 Wire Wire Line
-	17750 3300 17100 3300
+	11050 3000 10400 3000
 Wire Wire Line
-	17750 3100 17100 3100
+	11050 3400 10400 3400
 Wire Wire Line
-	17750 3500 17100 3500
+	8600 2900 9200 2900
 Wire Wire Line
-	1900 3000 2500 3000
+	9400 1100 9400 1200
 Wire Wire Line
-	9300 1000 9300 1100
+	9400 1200 9700 1200
 Wire Wire Line
-	9300 1100 9600 1100
+	9400 700  9700 700 
 Wire Wire Line
-	9300 600  9600 600 
+	10000 1100 10000 1200
 Wire Wire Line
-	9900 1000 9900 1100
+	10000 700  10000 800 
 Wire Wire Line
-	9900 600  9900 700 
+	10300 1200 10200 1200
+Connection ~ 10000 1200
 Wire Wire Line
-	10200 1100 10100 1100
-Connection ~ 9900 1100
+	10900 1200 11000 1200
 Wire Wire Line
-	10800 1100 10900 1100
+	11000 1200 11000 1150
 Wire Wire Line
-	10900 1100 10900 1050
+	11000 700  11000 850 
+Connection ~ 10000 700 
 Wire Wire Line
-	10900 600  10900 750 
-Connection ~ 9900 600 
-Wire Wire Line
-	11200 1100 11200 1000
-Connection ~ 10900 1100
+	11300 1200 11300 1100
+Connection ~ 11000 1200
 Wire Wire Line
 	7450 6850 7450 6750
 Wire Wire Line
@@ -846,46 +844,46 @@ Wire Wire Line
 Wire Wire Line
 	4100 6350 4100 6250
 Wire Wire Line
-	17100 3700 17400 3700
+	10400 3600 10700 3600
 Wire Wire Line
-	17800 3700 17900 3700
+	11100 3600 11200 3600
 Wire Wire Line
-	2400 3600 2500 3600
+	9100 3500 9200 3500
 Wire Wire Line
-	2400 3900 2500 3900
+	9100 3800 9200 3800
 Wire Wire Line
-	2400 4000 2500 4000
+	9100 3900 9200 3900
 Wire Wire Line
-	17100 4000 17200 4000
+	10400 3900 10500 3900
 Wire Wire Line
-	17100 4100 17200 4100
+	10400 4000 10500 4000
 Wire Wire Line
-	17100 4400 17200 4400
+	10400 4300 10500 4300
 Wire Wire Line
-	17700 4500 17600 4500
+	11000 4400 10900 4400
 Wire Wire Line
-	17300 4500 17200 4500
+	10600 4400 10500 4400
 Wire Wire Line
-	17200 4500 17200 4400
-Connection ~ 18150 4400
-Connection ~ 18150 4200
-Connection ~ 18150 4100
+	10500 4400 10500 4300
+Connection ~ 11450 4300
+Connection ~ 11450 4100
+Connection ~ 11450 4000
 Wire Wire Line
-	2400 3200 2500 3200
+	9100 3100 9200 3100
 Wire Wire Line
-	2400 3300 2500 3300
+	9100 3200 9200 3200
 Wire Wire Line
-	2400 3400 2500 3400
+	9100 3300 9200 3300
 Wire Wire Line
-	2400 3500 2500 3500
+	9100 3400 9200 3400
 Wire Wire Line
-	2400 3700 2500 3700
+	9100 3600 9200 3600
 Wire Wire Line
-	2400 3800 2500 3800
+	9100 3700 9200 3700
 Wire Wire Line
-	18300 3700 18200 3700
+	11600 3600 11500 3600
 $Comp
-L stmbl1:GNDPWR #PWR031
+L stmbl:GNDPWR #PWR031
 U 1 1 58253463
 P 3200 5650
 F 0 "#PWR031" H 3200 5450 50  0001 C CNN
@@ -900,7 +898,7 @@ Wire Wire Line
 Wire Wire Line
 	5500 5650 5400 5650
 $Comp
-L stmbl1:+3.3VP #PWR032
+L stmbl:+3.3VP #PWR032
 U 1 1 58254A0F
 P 4100 6250
 F 0 "#PWR032" H 4250 6200 50  0001 C CNN
@@ -919,7 +917,7 @@ Wire Wire Line
 Wire Wire Line
 	5500 5550 5400 5550
 $Comp
-L stmbl1:USB_OTG P11
+L stmbl:USB_OTG P11
 U 1 1 582597E3
 P 6900 5650
 F 0 "P11" H 7225 5525 50  0000 C CNN
@@ -935,7 +933,7 @@ F 8 "" V 6850 5550 50  0001 C CNN "Tolerance"
 	0    -1   1    0   
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR033
+L stmbl:GNDPWR #PWR033
 U 1 1 5825A690
 P 6800 6250
 F 0 "#PWR033" H 6800 6050 50  0001 C CNN
@@ -948,7 +946,7 @@ $EndComp
 Wire Wire Line
 	6800 6050 6800 6150
 $Comp
-L stmbl1:R R151
+L stmbl:R R151
 U 1 1 5825AC16
 P 7550 5550
 F 0 "R151" V 7630 5550 50  0000 C CNN
@@ -971,7 +969,7 @@ Wire Wire Line
 	7300 5850 7200 5850
 Connection ~ 6800 6150
 $Comp
-L stmbl1:R R152
+L stmbl:R R152
 U 1 1 5825B725
 P 7550 5650
 F 0 "R152" V 7630 5650 50  0000 C CNN
@@ -987,7 +985,7 @@ F 8 "1%" H 7550 5650 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R150
+L stmbl:R R150
 U 1 1 5825B8D4
 P 7300 5300
 F 0 "R150" V 7380 5300 50  0000 C CNN
@@ -1010,7 +1008,7 @@ Wire Wire Line
 	7300 5450 7300 5650
 Connection ~ 7300 5650
 $Comp
-L stmbl1:+3.3VP #PWR034
+L stmbl:+3.3VP #PWR034
 U 1 1 5825BBE2
 P 7300 5050
 F 0 "#PWR034" H 7450 5000 50  0001 C CNN
@@ -1039,7 +1037,7 @@ Wire Wire Line
 Wire Wire Line
 	5800 6600 5900 6600
 $Comp
-L stmbl1:GNDPWR #PWR035
+L stmbl:GNDPWR #PWR035
 U 1 1 5825F749
 P 5800 6900
 F 0 "#PWR035" H 5800 6700 50  0001 C CNN
@@ -1054,43 +1052,43 @@ Wire Wire Line
 Wire Wire Line
 	5800 6800 5800 6900
 Wire Wire Line
-	17200 3000 17100 3000
+	10500 2900 10400 2900
 Wire Wire Line
-	17200 3600 17100 3600
+	10500 3500 10400 3500
 Wire Wire Line
-	2400 2900 2500 2900
+	9100 2800 9200 2800
 Wire Wire Line
-	17250 3400 17100 3400
+	10550 3300 10400 3300
 Wire Wire Line
-	17250 3200 17100 3200
+	10550 3100 10400 3100
 Wire Wire Line
-	2350 4200 2500 4200
+	9050 4100 9200 4100
 Wire Wire Line
-	2350 4100 2500 4100
+	9050 4000 9200 4000
 Wire Wire Line
-	2350 4300 2500 4300
+	9050 4200 9200 4200
 Wire Wire Line
-	2350 4400 2500 4400
+	9050 4300 9200 4300
 $Comp
-L stmbl1:R R118
+L stmbl:R R118
 U 1 1 582CAB11
-P 2150 2400
-F 0 "R118" V 2230 2400 50  0000 C CNN
-F 1 "1k" V 2150 2400 50  0000 C CNN
-F 2 "stmbl:R_0603" V 2080 2400 30  0001 C CNN
-F 3 "" H 2150 2400 30  0000 C CNN
-F 4 "" H 2150 2400 30  0001 C CNN "InternalName"
-F 5 "" H 2150 2400 30  0001 C CNN "Manufacturer No"
-F 6 "" H 2150 2400 30  0001 C CNN "Voltage"
-F 7 "" H 2150 2400 30  0001 C CNN "Source"
-F 8 "1%" H 2150 2400 30  0001 C CNN "Tolerance"
-	1    2150 2400
+P 8850 2300
+F 0 "R118" V 8930 2300 50  0000 C CNN
+F 1 "1k" V 8850 2300 50  0000 C CNN
+F 2 "stmbl:R_0603" V 8780 2300 30  0001 C CNN
+F 3 "" H 8850 2300 30  0000 C CNN
+F 4 "" H 8850 2300 30  0001 C CNN "InternalName"
+F 5 "" H 8850 2300 30  0001 C CNN "Manufacturer No"
+F 6 "" H 8850 2300 30  0001 C CNN "Voltage"
+F 7 "" H 8850 2300 30  0001 C CNN "Source"
+F 8 "1%" H 8850 2300 30  0001 C CNN "Tolerance"
+	1    8850 2300
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	2300 2400 2400 2400
+	9000 2300 9100 2300
 $Comp
-L stmbl1:CONN_01X04 P7
+L stmbl:CONN_01X04 P7
 U 1 1 5834327D
 P 6100 6650
 F 0 "P7" H 6100 6900 50  0000 C CNN
@@ -1106,7 +1104,7 @@ F 8 "" H 6100 6650 60  0001 C CNN "Tolerance"
 	1    0    0    1   
 $EndComp
 $Comp
-L stmbl1:+3.3VP #PWR036
+L stmbl:+3.3VP #PWR036
 U 1 1 58343912
 P 5800 6400
 F 0 "#PWR036" H 5950 6350 50  0001 C CNN
@@ -1121,184 +1119,186 @@ Wire Wire Line
 Wire Wire Line
 	5800 6500 5900 6500
 $Comp
-L stmbl1:GNDPWR #PWR037
+L stmbl:GNDPWR #PWR037
 U 1 1 58350C19
-P 2400 3100
-F 0 "#PWR037" H 2400 2900 50  0001 C CNN
-F 1 "GNDPWR" H 2400 2970 50  0000 C CNN
-F 2 "" H 2400 3050 60  0000 C CNN
-F 3 "" H 2400 3050 60  0000 C CNN
-	1    2400 3100
+P 9100 3000
+F 0 "#PWR037" H 9100 2800 50  0001 C CNN
+F 1 "GNDPWR" H 9100 2870 50  0000 C CNN
+F 2 "" H 9100 2950 60  0000 C CNN
+F 3 "" H 9100 2950 60  0000 C CNN
+	1    9100 3000
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	2400 3100 2500 3100
+	9100 3000 9200 3000
 $Comp
-L stmbl1:GNDPWR #PWR038
+L stmbl:GNDPWR #PWR038
 U 1 1 5835165C
-P 17200 2900
-F 0 "#PWR038" H 17200 2700 50  0001 C CNN
-F 1 "GNDPWR" H 17200 2770 50  0000 C CNN
-F 2 "" H 17200 2850 60  0000 C CNN
-F 3 "" H 17200 2850 60  0000 C CNN
-	1    17200 2900
+P 10500 2800
+F 0 "#PWR038" H 10500 2600 50  0001 C CNN
+F 1 "GNDPWR" H 10500 2670 50  0000 C CNN
+F 2 "" H 10500 2750 60  0000 C CNN
+F 3 "" H 10500 2750 60  0000 C CNN
+	1    10500 2800
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	17200 2900 17100 2900
+	10500 2800 10400 2800
 NoConn ~ 10450 6700
 NoConn ~ 7200 5450
 NoConn ~ 7200 5750
 Wire Wire Line
-	17100 3900 17200 3900
+	10400 3800 10500 3800
 Wire Wire Line
-	17100 3800 17200 3800
-Text HLabel 17200 3900 2    60   Input ~ 0
+	10400 3700 10500 3700
+Text HLabel 10500 3800 2    60   Input ~ 0
 IO_RX
-Text HLabel 17200 3800 2    60   Input ~ 0
+Text HLabel 10500 3700 2    60   Input ~ 0
 IO_TX
 Wire Wire Line
-	2400 2500 2500 2500
+	9100 2400 9200 2400
 Wire Wire Line
-	2500 2600 2400 2600
+	9200 2500 9100 2500
 Wire Wire Line
-	2400 2700 2500 2700
+	9100 2600 9200 2600
 $Comp
-L stmbl1:+3.3VP #PWR039
+L stmbl:+3.3VP #PWR039
 U 1 1 5886E42D
-P 2400 2700
-F 0 "#PWR039" H 2550 2650 50  0001 C CNN
-F 1 "+3.3VP" H 2400 2800 50  0000 C CNN
-F 2 "" H 2400 2700 60  0000 C CNN
-F 3 "" H 2400 2700 60  0000 C CNN
-	1    2400 2700
+P 9100 2600
+F 0 "#PWR039" H 9250 2550 50  0001 C CNN
+F 1 "+3.3VP" H 9100 2700 50  0000 C CNN
+F 2 "" H 9100 2600 60  0000 C CNN
+F 3 "" H 9100 2600 60  0000 C CNN
+	1    9100 2600
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:+3.3VP #PWR040
+L stmbl:+3.3VP #PWR040
 U 1 1 5886E4F8
-P 2400 2600
-F 0 "#PWR040" H 2550 2550 50  0001 C CNN
-F 1 "+3.3VP" H 2400 2700 50  0000 C CNN
-F 2 "" H 2400 2600 60  0000 C CNN
-F 3 "" H 2400 2600 60  0000 C CNN
-	1    2400 2600
+P 9100 2500
+F 0 "#PWR040" H 9250 2450 50  0001 C CNN
+F 1 "+3.3VP" H 9100 2600 50  0000 C CNN
+F 2 "" H 9100 2500 60  0000 C CNN
+F 3 "" H 9100 2500 60  0000 C CNN
+	1    9100 2500
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:+3.3VP #PWR041
+L stmbl:+3.3VP #PWR041
 U 1 1 5886E563
-P 2400 2500
-F 0 "#PWR041" H 2550 2450 50  0001 C CNN
-F 1 "+3.3VP" H 2400 2600 50  0000 C CNN
-F 2 "" H 2400 2500 60  0000 C CNN
-F 3 "" H 2400 2500 60  0000 C CNN
-	1    2400 2500
+P 9100 2400
+F 0 "#PWR041" H 9250 2350 50  0001 C CNN
+F 1 "+3.3VP" H 9100 2500 50  0000 C CNN
+F 2 "" H 9100 2400 60  0000 C CNN
+F 3 "" H 9100 2400 60  0000 C CNN
+	1    9100 2400
 	0    -1   -1   0   
 $EndComp
-Text Notes 18400 5500 1    60   ~ 0
+Text Notes 11700 5400 1    60   ~ 0
 do not populate ->
 Wire Wire Line
-	800  1800 800  1900
+	7500 1700 7500 1800
 Wire Wire Line
-	2400 1600 2500 1600
+	9100 1500 9200 1500
 Wire Wire Line
-	1900 2100 2400 2100
+	8600 2000 9100 2000
 Wire Wire Line
-	1900 2400 2000 2400
+	8600 2300 8700 2300
 Wire Wire Line
-	1100 2000 1100 2100
+	7800 1900 7800 2000
 Wire Wire Line
-	9800 1100 9800 1200
+	9900 1200 9900 1300
 Wire Wire Line
-	9700 1100 9700 1200
+	9800 1200 9800 1300
 Wire Wire Line
-	9700 1100 9800 1100
+	9800 1200 9900 1200
 Wire Wire Line
-	9600 1100 9600 1200
+	9700 1200 9700 1300
 Wire Wire Line
-	9600 1100 9700 1100
+	9700 1200 9800 1200
 Wire Wire Line
-	9800 600  9900 600 
+	9900 700  10000 700 
 Wire Wire Line
-	9700 600  9800 600 
+	9800 700  9900 700 
 Wire Wire Line
-	9600 600  9700 600 
+	9700 700  9800 700 
 Wire Wire Line
-	9900 4900 9900 5000
+	10000 4600 10000 4700
 Wire Wire Line
-	9700 4900 9800 4900
+	9800 4600 9900 4600
 Wire Wire Line
-	9800 4900 9900 4900
+	9900 4600 10000 4600
 Wire Wire Line
-	9900 1100 9900 1200
+	10000 1200 10000 1300
 Wire Wire Line
-	9900 600  10100 600 
+	10000 700  10200 700 
 Wire Wire Line
-	10900 1100 11200 1100
+	11000 1200 11300 1200
 Wire Wire Line
-	18150 4400 18600 4400
+	11450 4300 11900 4300
 Wire Wire Line
-	18150 4200 18600 4200
+	11450 4100 11900 4100
 Wire Wire Line
-	18150 4100 18600 4100
+	11450 4000 11900 4000
 Wire Wire Line
 	6800 6150 6800 6250
 Wire Wire Line
 	7300 5650 7400 5650
 $Comp
-L stmbl1:testpoint T2
+L stmbl:testpoint T2
 U 1 1 5AC8A042
-P 17950 2900
-F 0 "T2" H 17950 3000 60  0000 C CNN
-F 1 "testpoint" H 17950 2800 60  0000 C CNN
-F 2 "stmbl:Measurement_Point_Round-SMD-Pad_Small" H 17950 2900 60  0001 C CNN
-F 3 "" H 17950 2900 60  0000 C CNN
-F 4 "" H 17950 2900 60  0001 C CNN "InternalName"
-F 5 "" H 17950 2900 60  0001 C CNN "Manufacturer No"
-F 6 "" H 17950 2900 60  0001 C CNN "Voltage"
-F 7 "" H 17950 2900 60  0001 C CNN "Source"
-F 8 "" H 17950 2900 60  0001 C CNN "Tolerance"
-	1    17950 2900
+P 11250 2800
+F 0 "T2" H 11250 2900 60  0000 C CNN
+F 1 "testpoint" H 11250 2700 60  0000 C CNN
+F 2 "stmbl:Measurement_Point_Round-SMD-Pad_Small" H 11250 2800 60  0001 C CNN
+F 3 "" H 11250 2800 60  0000 C CNN
+F 4 "" H 11250 2800 60  0001 C CNN "InternalName"
+F 5 "" H 11250 2800 60  0001 C CNN "Manufacturer No"
+F 6 "" H 11250 2800 60  0001 C CNN "Voltage"
+F 7 "" H 11250 2800 60  0001 C CNN "Source"
+F 8 "" H 11250 2800 60  0001 C CNN "Tolerance"
+	1    11250 2800
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR0230
+L stmbl:GNDPWR #PWR0230
 U 1 1 5AC90312
-P 17650 2900
-F 0 "#PWR0230" H 17650 2700 50  0001 C CNN
-F 1 "GNDPWR" H 17650 2770 50  0000 C CNN
-F 2 "" H 17650 2850 60  0000 C CNN
-F 3 "" H 17650 2850 60  0000 C CNN
-	1    17650 2900
+P 10950 2800
+F 0 "#PWR0230" H 10950 2600 50  0001 C CNN
+F 1 "GNDPWR" H 10950 2670 50  0000 C CNN
+F 2 "" H 10950 2750 60  0000 C CNN
+F 3 "" H 10950 2750 60  0000 C CNN
+	1    10950 2800
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	17650 2900 17750 2900
+	10950 2800 11050 2800
 $Comp
-L stmbl1:C C141
+L stmbl:C C141
 U 1 1 5AD22026
-P 10100 850
-F 0 "C141" H 10125 950 50  0000 L CNN
-F 1 "2.2µ" H 10125 750 50  0000 L CNN
-F 2 "stmbl:C_0603" H 10138 700 30  0001 C CNN
-F 3 "" H 10100 850 60  0000 C CNN
-F 4 "" H 10100 850 60  0001 C CNN "InternalName"
-F 5 "" H 10100 850 60  0001 C CNN "Manufacturer No"
-F 6 "25V" H 10100 850 60  0001 C CNN "Voltage"
-F 7 "" H 10100 850 60  0001 C CNN "Source"
-F 8 "X7R" H 10100 850 60  0001 C CNN "Tolerance"
-	1    10100 850 
+P 10200 950
+F 0 "C141" H 10225 1050 50  0000 L CNN
+F 1 "2.2µ" H 10225 850 50  0000 L CNN
+F 2 "stmbl:C_0603" H 10238 800 30  0001 C CNN
+F 3 "" H 10200 950 60  0000 C CNN
+F 4 "" H 10200 950 60  0001 C CNN "InternalName"
+F 5 "" H 10200 950 60  0001 C CNN "Manufacturer No"
+F 6 "25V" H 10200 950 60  0001 C CNN "Voltage"
+F 7 "" H 10200 950 60  0001 C CNN "Source"
+F 8 "X7R" H 10200 950 60  0001 C CNN "Tolerance"
+	1    10200 950 
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10100 1000 10100 1100
-Connection ~ 10100 1100
+	10200 1100 10200 1200
+Connection ~ 10200 1200
 Wire Wire Line
-	10100 1100 9900 1100
+	10200 1200 10000 1200
 Wire Wire Line
-	10100 700  10100 600 
-Connection ~ 10100 600 
+	10200 800  10200 700 
+Connection ~ 10200 700 
 Wire Wire Line
-	10100 600  10900 600 
+	10200 700  11000 700 
+Wire Wire Line
+	9100 500  11350 500 
 $EndSCHEMATC
diff --git a/hw/kicad/v4.0/f4.sch b/hw/kicad/v4.0/f4.sch
index e92dd09e..3fd78c3a 100644
--- a/hw/kicad/v4.0/f4.sch
+++ b/hw/kicad/v4.0/f4.sch
@@ -15,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L stmbl1:STM32F405VG U26
+L stmbl:STM32F405VG U26
 U 1 1 565FD974
 P 10200 5500
 F 0 "U26" H 10200 5500 50  0000 C CNN
@@ -31,7 +31,7 @@ F 8 "" H 10200 5500 50  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:Crystal Y2
+L stmbl:Crystal Y2
 U 1 1 565FDF0A
 P 4700 3700
 F 0 "Y2" H 4700 3850 50  0000 C CNN
@@ -47,7 +47,7 @@ F 8 "" H 4700 3700 60  0001 C CNN "InternalName"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C31
+L stmbl:C C31
 U 1 1 565FDF4E
 P 4350 3400
 F 0 "C31" H 4375 3500 50  0000 L CNN
@@ -63,7 +63,7 @@ F 8 "X7R" H 4350 3400 60  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C32
+L stmbl:C C32
 U 1 1 565FDFAD
 P 4350 4000
 F 0 "C32" H 4375 4100 50  0000 L CNN
@@ -79,7 +79,7 @@ F 8 "X7R" H 4350 4000 60  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0177
+L stmbl:GND #PWR0177
 U 1 1 565FE0C3
 P 4100 4000
 F 0 "#PWR0177" H 4100 3750 50  0001 C CNN
@@ -90,7 +90,7 @@ F 3 "" H 4100 4000 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0178
+L stmbl:GND #PWR0178
 U 1 1 565FE0E1
 P 4100 3400
 F 0 "#PWR0178" H 4100 3150 50  0001 C CNN
@@ -101,7 +101,7 @@ F 3 "" H 4100 3400 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C90
+L stmbl:C C90
 U 1 1 565FE1E0
 P 11600 8750
 F 0 "C90" H 11625 8850 50  0000 L CNN
@@ -117,7 +117,7 @@ F 8 "X7R" H 11600 8750 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C88
+L stmbl:C C88
 U 1 1 565FE20A
 P 11100 8750
 F 0 "C88" H 11125 8850 50  0000 L CNN
@@ -133,7 +133,7 @@ F 8 "X7R" H 11100 8750 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0179
+L stmbl:GND #PWR0179
 U 1 1 565FE268
 P 10600 8600
 F 0 "#PWR0179" H 10600 8350 50  0001 C CNN
@@ -144,7 +144,7 @@ F 3 "" H 10600 8600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0180
+L stmbl:GND #PWR0180
 U 1 1 565FE28C
 P 10400 8600
 F 0 "#PWR0180" H 10400 8350 50  0001 C CNN
@@ -155,7 +155,7 @@ F 3 "" H 10400 8600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0181
+L stmbl:GND #PWR0181
 U 1 1 565FE2A9
 P 10200 8600
 F 0 "#PWR0181" H 10200 8350 50  0001 C CNN
@@ -166,7 +166,7 @@ F 3 "" H 10200 8600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0182
+L stmbl:GND #PWR0182
 U 1 1 565FE2C6
 P 10000 8600
 F 0 "#PWR0182" H 10000 8350 50  0001 C CNN
@@ -177,7 +177,7 @@ F 3 "" H 10000 8600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0183
+L stmbl:GND #PWR0183
 U 1 1 565FE2E3
 P 9800 8600
 F 0 "#PWR0183" H 9800 8350 50  0001 C CNN
@@ -188,7 +188,7 @@ F 3 "" H 9800 8600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0184
+L stmbl:GND #PWR0184
 U 1 1 565FE300
 P 11100 9000
 F 0 "#PWR0184" H 11100 8750 50  0001 C CNN
@@ -199,7 +199,7 @@ F 3 "" H 11100 9000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0185
+L stmbl:GND #PWR0185
 U 1 1 565FE31D
 P 11600 9000
 F 0 "#PWR0185" H 11600 8750 50  0001 C CNN
@@ -210,7 +210,7 @@ F 3 "" H 11600 9000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C89
+L stmbl:C C89
 U 1 1 565FE528
 P 11400 2150
 F 0 "C89" H 11425 2250 50  0000 L CNN
@@ -226,7 +226,7 @@ F 8 "X7R" H 11400 2150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C87
+L stmbl:C C87
 U 1 1 565FE6F4
 P 10900 2150
 F 0 "C87" H 10925 2250 50  0000 L CNN
@@ -242,7 +242,7 @@ F 8 "X7R" H 10900 2150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C86
+L stmbl:C C86
 U 1 1 565FE720
 P 10600 2150
 F 0 "C86" H 10625 2250 50  0000 L CNN
@@ -258,7 +258,7 @@ F 8 "X7R" H 10600 2150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C85
+L stmbl:C C85
 U 1 1 565FE74C
 P 10300 2150
 F 0 "C85" H 10325 2250 50  0000 L CNN
@@ -274,7 +274,7 @@ F 8 "X7R" H 10300 2150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C84
+L stmbl:C C84
 U 1 1 565FE77A
 P 10000 2150
 F 0 "C84" H 10025 2250 50  0000 L CNN
@@ -290,7 +290,7 @@ F 8 "X7R" H 10000 2150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C80
+L stmbl:C C80
 U 1 1 565FE7A9
 P 9700 2150
 F 0 "C80" H 9725 2250 50  0000 L CNN
@@ -306,7 +306,7 @@ F 8 "X7R" H 9700 2150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C77
+L stmbl:C C77
 U 1 1 565FE7DB
 P 9400 2150
 F 0 "C77" H 9425 2250 50  0000 L CNN
@@ -322,7 +322,7 @@ F 8 "X7R" H 9400 2150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C65
+L stmbl:C C65
 U 1 1 565FE80F
 P 8400 2150
 F 0 "C65" H 8425 2250 50  0000 L CNN
@@ -338,7 +338,7 @@ F 8 "X7R" H 8400 2150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3V #PWR0186
+L stmbl:+3.3V #PWR0186
 U 1 1 565FEC9D
 P 11800 2300
 F 0 "#PWR0186" H 11800 2150 50  0001 C CNN
@@ -349,7 +349,7 @@ F 3 "" H 11800 2300 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0187
+L stmbl:GND #PWR0187
 U 1 1 565FECDB
 P 11400 1900
 F 0 "#PWR0187" H 11400 1650 50  0001 C CNN
@@ -360,7 +360,7 @@ F 3 "" H 11400 1900 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0188
+L stmbl:GND #PWR0188
 U 1 1 565FED17
 P 10900 1900
 F 0 "#PWR0188" H 10900 1650 50  0001 C CNN
@@ -371,7 +371,7 @@ F 3 "" H 10900 1900 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0189
+L stmbl:GND #PWR0189
 U 1 1 565FED4C
 P 10600 1900
 F 0 "#PWR0189" H 10600 1650 50  0001 C CNN
@@ -382,7 +382,7 @@ F 3 "" H 10600 1900 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0190
+L stmbl:GND #PWR0190
 U 1 1 565FED81
 P 10300 1900
 F 0 "#PWR0190" H 10300 1650 50  0001 C CNN
@@ -393,7 +393,7 @@ F 3 "" H 10300 1900 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0191
+L stmbl:GND #PWR0191
 U 1 1 565FEDB6
 P 10000 1900
 F 0 "#PWR0191" H 10000 1650 50  0001 C CNN
@@ -404,7 +404,7 @@ F 3 "" H 10000 1900 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0192
+L stmbl:GND #PWR0192
 U 1 1 565FEDEB
 P 9700 1900
 F 0 "#PWR0192" H 9700 1650 50  0001 C CNN
@@ -415,7 +415,7 @@ F 3 "" H 9700 1900 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0193
+L stmbl:GND #PWR0193
 U 1 1 565FEE20
 P 9400 1900
 F 0 "#PWR0193" H 9400 1650 50  0001 C CNN
@@ -426,7 +426,7 @@ F 3 "" H 9400 1900 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0194
+L stmbl:GND #PWR0194
 U 1 1 565FF1AF
 P 8400 1900
 F 0 "#PWR0194" H 8400 1650 50  0001 C CNN
@@ -437,7 +437,7 @@ F 3 "" H 8400 1900 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:INDUCTOR L3
+L stmbl:INDUCTOR L3
 U 1 1 565FF296
 P 8900 2400
 F 0 "L3" V 8850 2400 50  0000 C CNN
@@ -453,7 +453,7 @@ F 8 "" H 8900 2400 60  0001 C CNN "Tolerance"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:C C29
+L stmbl:C C29
 U 1 1 565FFAD0
 P 4600 2850
 F 0 "C29" H 4625 2950 50  0000 L CNN
@@ -469,7 +469,7 @@ F 8 "X7R" H 4600 2850 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0195
+L stmbl:GND #PWR0195
 U 1 1 565FFB31
 P 4600 2600
 F 0 "#PWR0195" H 4600 2350 50  0001 C CNN
@@ -480,7 +480,7 @@ F 3 "" H 4600 2600 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:USB_OTG P1
+L stmbl:USB_OTG P1
 U 1 1 56602983
 P 850 6000
 F 0 "P1" H 1175 5875 50  0000 C CNN
@@ -496,7 +496,7 @@ F 8 "" V 800 5900 60  0001 C CNN "Tolerance"
 	0    -1   1    0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0196
+L stmbl:GND #PWR0196
 U 1 1 56602FE1
 P 750 6900
 F 0 "#PWR0196" H 750 6650 50  0001 C CNN
@@ -507,7 +507,7 @@ F 3 "" H 750 6900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0197
+L stmbl:GND #PWR0197
 U 1 1 56603874
 P 1250 6300
 F 0 "#PWR0197" H 1250 6050 50  0001 C CNN
@@ -518,7 +518,7 @@ F 3 "" H 1250 6300 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0198
+L stmbl:GND #PWR0198
 U 1 1 5667D307
 P 1650 6550
 F 0 "#PWR0198" H 1650 6300 50  0001 C CNN
@@ -529,7 +529,7 @@ F 3 "" H 1650 6550 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:+3.3V #PWR0199
+L stmbl:+3.3V #PWR0199
 U 1 1 5667D40D
 P 4400 6450
 F 0 "#PWR0199" H 4400 6300 50  0001 C CNN
@@ -540,7 +540,7 @@ F 3 "" H 4400 6450 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:USBLC6-4SC6 U1
+L stmbl:USBLC6-4SC6 U1
 U 1 1 5667D8FF
 P 2800 6550
 F 0 "U1" H 2101 6898 50  0000 C CNN
@@ -552,7 +552,7 @@ F 4 "USBLC6-4SC6" H 2101 6998 50  0001 C CNN "Manufacturer No"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R116
+L stmbl:R R116
 U 1 1 5668EA86
 P 7850 9050
 F 0 "R116" V 7930 9050 50  0000 C CNN
@@ -568,7 +568,7 @@ F 8 "" H 7850 9050 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R117
+L stmbl:R R117
 U 1 1 5668EAFB
 P 7850 9550
 F 0 "R117" V 7930 9550 50  0000 C CNN
@@ -584,7 +584,7 @@ F 8 "" H 7850 9550 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0200
+L stmbl:GND #PWR0200
 U 1 1 5668EC91
 P 7850 9900
 F 0 "#PWR0200" H 7850 9650 50  0001 C CNN
@@ -595,7 +595,7 @@ F 3 "" H 7850 9900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R121
+L stmbl:R R121
 U 1 1 5668F2EF
 P 8750 9050
 F 0 "R121" V 8830 9050 50  0000 C CNN
@@ -611,7 +611,7 @@ F 8 "" H 8750 9050 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R122
+L stmbl:R R122
 U 1 1 5668F395
 P 8750 9550
 F 0 "R122" V 8830 9550 50  0000 C CNN
@@ -627,7 +627,7 @@ F 8 "" H 8750 9550 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0201
+L stmbl:GND #PWR0201
 U 1 1 5668F551
 P 8750 9900
 F 0 "#PWR0201" H 8750 9650 50  0001 C CNN
@@ -638,7 +638,7 @@ F 3 "" H 8750 9900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C81
+L stmbl:C C81
 U 1 1 56692CBC
 P 8950 9550
 F 0 "C81" H 8975 9650 50  0000 L CNN
@@ -654,7 +654,7 @@ F 8 "X7R" H 8950 9550 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C64
+L stmbl:C C64
 U 1 1 56693D94
 P 8050 9550
 F 0 "C64" H 8075 9650 50  0000 L CNN
@@ -670,7 +670,7 @@ F 8 "X7R" H 8050 9550 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R61
+L stmbl:R R61
 U 1 1 566A9C27
 P 4850 2750
 F 0 "R61" V 4930 2750 50  0000 C CNN
@@ -686,7 +686,7 @@ F 8 "" H 4850 2750 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0202
+L stmbl:GND #PWR0202
 U 1 1 566A9D9E
 P 4850 2500
 F 0 "#PWR0202" H 4850 2250 50  0001 C CNN
@@ -697,7 +697,7 @@ F 3 "" H 4850 2500 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:Jumper_NO_Small JP9
+L stmbl:Jumper_NO_Small JP9
 U 1 1 566A9E2C
 P 5100 2800
 F 0 "JP9" H 5100 2880 50  0000 C CNN
@@ -713,7 +713,7 @@ F 8 "" H 5100 2800 60  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:+3.3V #PWR0203
+L stmbl:+3.3V #PWR0203
 U 1 1 566A9F89
 P 5100 2600
 F 0 "#PWR0203" H 5100 2450 50  0001 C CNN
@@ -724,7 +724,7 @@ F 3 "" H 5100 2600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0204
+L stmbl:GND #PWR0204
 U 1 1 56667EDB
 P 3050 7050
 F 0 "#PWR0204" H 3050 6800 50  0001 C CNN
@@ -735,7 +735,7 @@ F 3 "" H 3050 7050 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L stmbl1:+3.3V #PWR0205
+L stmbl:+3.3V #PWR0205
 U 1 1 566680A9
 P 2550 7050
 F 0 "#PWR0205" H 2550 6900 50  0001 C CNN
@@ -746,7 +746,7 @@ F 3 "" H 2550 7050 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L stmbl1:C C16
+L stmbl:C C16
 U 1 1 5666869C
 P 2800 7050
 F 0 "C16" H 2825 7150 50  0000 L CNN
@@ -762,7 +762,7 @@ F 8 "X7R" H 2800 7050 60  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C119
+L stmbl:C C119
 U 1 1 57B075E7
 P 8100 2150
 F 0 "C119" H 8125 2250 50  0000 L CNN
@@ -778,7 +778,7 @@ F 8 "X7R" H 8100 2150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0206
+L stmbl:GND #PWR0206
 U 1 1 57B0781F
 P 8100 1900
 F 0 "#PWR0206" H 8100 1650 50  0001 C CNN
@@ -789,7 +789,7 @@ F 3 "" H 8100 1900 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:C C1
+L stmbl:C C1
 U 1 1 56602D8C
 P 850 6650
 F 0 "C1" H 875 6750 50  0000 L CNN
@@ -805,7 +805,7 @@ F 8 "X7R" H 850 6650 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R1
+L stmbl:R R1
 U 1 1 56602DEB
 P 650 6650
 F 0 "R1" V 730 6650 50  0000 C CNN
@@ -821,7 +821,7 @@ F 8 "" H 650 6650 30  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:USBLC6-4SC6 U23
+L stmbl:USBLC6-4SC6 U23
 U 1 1 5818ACD1
 P 4600 10150
 F 0 "U23" H 3901 10498 50  0000 C CNN
@@ -833,7 +833,7 @@ F 4 "USBLC6-4SC6" H 3901 10598 50  0001 C CNN "Manufacturer No"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:USBLC6-4SC6 U20
+L stmbl:USBLC6-4SC6 U20
 U 1 1 5818ACD9
 P 2800 1950
 F 0 "U20" H 2101 2298 50  0000 C CNN
@@ -845,7 +845,7 @@ F 4 "USBLC6-4SC6" H 2800 1950 50  0001 C CNN "Manufacturer No"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L stmbl1:USBLC6-4SC6 U22
+L stmbl:USBLC6-4SC6 U22
 U 1 1 5818ACE1
 P 2800 2650
 F 0 "U22" H 2101 2998 50  0000 C CNN
@@ -857,7 +857,7 @@ F 4 "USBLC6-4SC6" H 2101 3098 50  0001 C CNN "Manufacturer No"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C61
+L stmbl:C C61
 U 1 1 5818ACE8
 P 2150 3450
 F 0 "C61" H 2175 3550 50  0000 L CNN
@@ -873,7 +873,7 @@ F 8 "X7R" H 2150 3450 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C66
+L stmbl:C C66
 U 1 1 5818ACEF
 P 2600 3450
 F 0 "C66" H 2625 3550 50  0000 L CNN
@@ -889,7 +889,7 @@ F 8 "X7R" H 2600 3450 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C67
+L stmbl:C C67
 U 1 1 5818ACF6
 P 4750 9250
 F 0 "C67" H 4775 9350 50  0000 L CNN
@@ -905,7 +905,7 @@ F 8 "X7R" H 4750 9250 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0207
+L stmbl:GND #PWR0207
 U 1 1 5818ACFD
 P 3450 10150
 F 0 "#PWR0207" H 3450 9900 50  0001 C CNN
@@ -916,7 +916,7 @@ F 3 "" H 3450 10150 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0208
+L stmbl:GND #PWR0208
 U 1 1 5818AD03
 P 3950 1950
 F 0 "#PWR0208" H 3950 1700 50  0001 C CNN
@@ -927,7 +927,7 @@ F 3 "" H 3950 1950 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0209
+L stmbl:GND #PWR0209
 U 1 1 5818AD09
 P 3950 2650
 F 0 "#PWR0209" H 3950 2400 50  0001 C CNN
@@ -938,7 +938,7 @@ F 3 "" H 3950 2650 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0210
+L stmbl:GND #PWR0210
 U 1 1 5818AD0F
 P 4750 9500
 F 0 "#PWR0210" H 4750 9250 50  0001 C CNN
@@ -949,7 +949,7 @@ F 3 "" H 4750 9500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0211
+L stmbl:GND #PWR0211
 U 1 1 5818AD15
 P 2600 3700
 F 0 "#PWR0211" H 2600 3450 50  0001 C CNN
@@ -960,7 +960,7 @@ F 3 "" H 2600 3700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0212
+L stmbl:GND #PWR0212
 U 1 1 5818AD1B
 P 2150 3700
 F 0 "#PWR0212" H 2150 3450 50  0001 C CNN
@@ -971,7 +971,7 @@ F 3 "" H 2150 3700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3V #PWR0213
+L stmbl:+3.3V #PWR0213
 U 1 1 5818AD21
 P 5750 10150
 F 0 "#PWR0213" H 5750 10000 50  0001 C CNN
@@ -982,7 +982,7 @@ F 3 "" H 5750 10150 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:+3.3V #PWR0214
+L stmbl:+3.3V #PWR0214
 U 1 1 5818AD3C
 P 4750 9000
 F 0 "#PWR0214" H 4750 8850 50  0001 C CNN
@@ -993,7 +993,7 @@ F 3 "" H 4750 9000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+24V #PWR0215
+L stmbl:+24V #PWR0215
 U 1 1 58234F7D
 P 7850 8800
 F 0 "#PWR0215" H 7850 8650 50  0001 C CNN
@@ -1004,7 +1004,7 @@ F 3 "" H 7850 8800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R153
+L stmbl:R R153
 U 1 1 582C978B
 P 4950 4000
 F 0 "R153" V 5030 4000 50  0000 C CNN
@@ -1020,7 +1020,7 @@ F 8 "" H 4950 4000 30  0001 C CNN "Source"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:+5V #PWR0216
+L stmbl:+5V #PWR0216
 U 1 1 5831AE80
 P 2150 3200
 F 0 "#PWR0216" H 2150 3050 50  0001 C CNN
@@ -1031,7 +1031,7 @@ F 3 "" H 2150 3200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+5V #PWR0217
+L stmbl:+5V #PWR0217
 U 1 1 5831AF04
 P 2600 3200
 F 0 "#PWR0217" H 2600 3050 50  0001 C CNN
@@ -1042,7 +1042,7 @@ F 3 "" H 2600 3200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+5V #PWR0218
+L stmbl:+5V #PWR0218
 U 1 1 5831BE71
 P 1650 1950
 F 0 "#PWR0218" H 1650 1800 50  0001 C CNN
@@ -1053,7 +1053,7 @@ F 3 "" H 1650 1950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:+5V #PWR0219
+L stmbl:+5V #PWR0219
 U 1 1 5831BF14
 P 1650 2650
 F 0 "#PWR0219" H 1650 2500 50  0001 C CNN
@@ -1064,7 +1064,7 @@ F 3 "" H 1650 2650 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:+5VA #PWR0220
+L stmbl:+5VA #PWR0220
 U 1 1 5832C893
 P 8750 8800
 F 0 "#PWR0220" H 8750 8650 50  0001 C CNN
@@ -1075,7 +1075,7 @@ F 3 "" H 8750 8800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0221
+L stmbl:GND #PWR0221
 U 1 1 5834B53B
 P 5000 6600
 F 0 "#PWR0221" H 5000 6350 50  0001 C CNN
@@ -1086,7 +1086,7 @@ F 3 "" H 5000 6600 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0222
+L stmbl:GND #PWR0222
 U 1 1 5834BAB3
 P 15300 8000
 F 0 "#PWR0222" H 15300 7750 50  0001 C CNN
@@ -1097,7 +1097,7 @@ F 3 "" H 15300 8000 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0223
+L stmbl:GND #PWR0223
 U 1 1 5834C236
 P 15300 8100
 F 0 "#PWR0223" H 15300 7850 50  0001 C CNN
@@ -1108,7 +1108,7 @@ F 3 "" H 15300 8100 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0224
+L stmbl:GND #PWR0224
 U 1 1 5834C460
 P 15300 7500
 F 0 "#PWR0224" H 15300 7250 50  0001 C CNN
@@ -1119,7 +1119,7 @@ F 3 "" H 15300 7500 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0225
+L stmbl:GND #PWR0225
 U 1 1 5834C5CD
 P 15300 7100
 F 0 "#PWR0225" H 15300 6850 50  0001 C CNN
@@ -1130,7 +1130,7 @@ F 3 "" H 15300 7100 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0226
+L stmbl:GND #PWR0226
 U 1 1 5834C64A
 P 15300 7000
 F 0 "#PWR0226" H 15300 6750 50  0001 C CNN
@@ -1141,7 +1141,7 @@ F 3 "" H 15300 7000 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0227
+L stmbl:GND #PWR0227
 U 1 1 5834CAE4
 P 15300 5000
 F 0 "#PWR0227" H 15300 4750 50  0001 C CNN
@@ -1152,7 +1152,7 @@ F 3 "" H 15300 5000 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0228
+L stmbl:GND #PWR0228
 U 1 1 5834CD84
 P 15300 4500
 F 0 "#PWR0228" H 15300 4250 50  0001 C CNN
@@ -1163,7 +1163,7 @@ F 3 "" H 15300 4500 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0229
+L stmbl:GND #PWR0229
 U 1 1 5834D0BD
 P 15300 3200
 F 0 "#PWR0229" H 15300 2950 50  0001 C CNN
diff --git a/hw/kicad/v4.0/fb.sch b/hw/kicad/v4.0/fb.sch
index 5a8e654a..f5081f20 100644
--- a/hw/kicad/v4.0/fb.sch
+++ b/hw/kicad/v4.0/fb.sch
@@ -4,7 +4,7 @@ EELAYER 26 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 12 14
+Sheet 11 14
 Title ""
 Date ""
 Rev ""
@@ -15,12 +15,12 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L stmbl1:LM358 U7
+L stmbl:LM358 U7
 U 1 1 5659192C
 P 5000 4500
 AR Path="/56590966/565F7162/5659192C" Ref="U7"  Part="1" 
 AR Path="/56590966/5659191C/5659192C" Ref="U6"  Part="1" 
-F 0 "U7" H 4950 4700 60  0000 L CNN
+F 0 "U6" H 4950 4700 60  0000 L CNN
 F 1 "LM358" H 4950 4250 60  0000 L CNN
 F 2 "stmbl:SOIC-8-N" H 5000 4500 60  0001 C CNN
 F 3 "" H 5000 4500 60  0000 C CNN
@@ -33,13 +33,13 @@ F 8 "" H 5000 4500 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl_4.0-rescue:SP3485EN-RESCUE-stmbl_4.0 U15
+L stmbl:SP3485 U15
 U 1 1 565DFE81
 P 8150 1250
 AR Path="/56590966/565F7162/565DFE81" Ref="U15"  Part="1" 
 AR Path="/56590966/5659191C/565DFE81" Ref="U14"  Part="1" 
 AR Path="/565DFE81" Ref="U15"  Part="1" 
-F 0 "U15" H 7850 1600 50  0000 L CNN
+F 0 "U14" H 7850 1600 50  0000 L CNN
 F 1 "SN65176B" H 8250 1600 50  0000 L CNN
 F 2 "stmbl:SOIC-8-N" H 8150 1250 50  0000 C CIN
 F 3 "" H 8150 1250 60  0000 C CNN
@@ -52,12 +52,12 @@ F 8 "" H 8150 1250 60  0001 C CNN "Tolerance"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L stmbl1:RJ45_LED J1
+L stmbl:RJ45_LED J1
 U 1 1 565DFE88
 P 1700 3350
 AR Path="/56590966/565F7162/565DFE88" Ref="J1"  Part="1" 
 AR Path="/56590966/5659191C/565DFE88" Ref="J2"  Part="1" 
-F 0 "J1" H 1700 2850 50  0000 C CNN
+F 0 "J2" H 1700 2850 50  0000 C CNN
 F 1 "RJ45_LED" H 1700 3750 50  0000 C CNN
 F 2 "stmbl:RJ45_LED" H 1700 3300 60  0001 C CNN
 F 3 "" H 1700 3300 60  0000 C CNN
@@ -70,12 +70,12 @@ F 8 "" H 1700 3300 60  0001 C CNN "Tolerance"
 	0    -1   1    0   
 $EndComp
 $Comp
-L stmbl1:R R110
+L stmbl:R R110
 U 1 1 565DFE8F
 P 7600 1250
 AR Path="/56590966/565F7162/565DFE8F" Ref="R110"  Part="1" 
 AR Path="/56590966/5659191C/565DFE8F" Ref="R109"  Part="1" 
-F 0 "R110" V 7680 1250 50  0000 C CNN
+F 0 "R109" V 7680 1250 50  0000 C CNN
 F 1 "120" V 7600 1250 50  0000 C CNN
 F 2 "stmbl:R_0603" V 7530 1250 30  0001 C CNN
 F 3 "" H 7600 1250 30  0000 C CNN
@@ -88,12 +88,12 @@ F 8 "1%" H 7600 1250 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C71
+L stmbl:C C71
 U 1 1 565DFE96
 P 9200 1250
 AR Path="/56590966/565F7162/565DFE96" Ref="C71"  Part="1" 
 AR Path="/56590966/5659191C/565DFE96" Ref="C72"  Part="1" 
-F 0 "C71" H 9225 1350 50  0000 L CNN
+F 0 "C72" H 9225 1350 50  0000 L CNN
 F 1 "100n" H 9225 1150 50  0000 L CNN
 F 2 "stmbl:C_0603" H 9238 1100 30  0001 C CNN
 F 3 "" H 9200 1250 60  0000 C CNN
@@ -106,12 +106,12 @@ F 8 "X7R" H 9200 1250 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0125
+L stmbl:GND #PWR0125
 U 1 1 565DFE9D
 P 8150 1750
 AR Path="/56590966/565F7162/565DFE9D" Ref="#PWR0125"  Part="1" 
 AR Path="/56590966/5659191C/565DFE9D" Ref="#PWR0105"  Part="1" 
-F 0 "#PWR0125" H 8150 1500 50  0001 C CNN
+F 0 "#PWR0105" H 8150 1500 50  0001 C CNN
 F 1 "GND" H 8150 1600 50  0000 C CNN
 F 2 "" H 8150 1750 60  0000 C CNN
 F 3 "" H 8150 1750 60  0000 C CNN
@@ -123,13 +123,13 @@ D12
 Text HLabel 8650 1250 2    60   Input ~ 0
 E12
 $Comp
-L stmbl_4.0-rescue:SP3485EN-RESCUE-stmbl_4.0 U16
+L stmbl:SP3485 U16
 U 1 1 565DFEAC
 P 8150 2650
 AR Path="/56590966/565F7162/565DFEAC" Ref="U16"  Part="1" 
 AR Path="/56590966/5659191C/565DFEAC" Ref="U17"  Part="1" 
 AR Path="/565DFEAC" Ref="U16"  Part="1" 
-F 0 "U16" H 7850 3000 50  0000 L CNN
+F 0 "U17" H 7850 3000 50  0000 L CNN
 F 1 "SN65176B" H 8250 3000 50  0000 L CNN
 F 2 "stmbl:SOIC-8-N" H 8150 2650 50  0000 C CIN
 F 3 "" H 8150 2650 60  0000 C CNN
@@ -142,12 +142,12 @@ F 8 "" H 8150 2650 60  0001 C CNN "Tolerance"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R112
+L stmbl:R R112
 U 1 1 565DFEB3
 P 7600 2650
 AR Path="/56590966/565F7162/565DFEB3" Ref="R112"  Part="1" 
 AR Path="/56590966/5659191C/565DFEB3" Ref="R111"  Part="1" 
-F 0 "R112" V 7680 2650 50  0000 C CNN
+F 0 "R111" V 7680 2650 50  0000 C CNN
 F 1 "120" V 7600 2650 50  0000 C CNN
 F 2 "stmbl:R_0603" V 7530 2650 30  0001 C CNN
 F 3 "" H 7600 2650 30  0000 C CNN
@@ -160,12 +160,12 @@ F 8 "1%" H 7600 2650 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C73
+L stmbl:C C73
 U 1 1 565DFEBA
 P 9200 2650
 AR Path="/56590966/565F7162/565DFEBA" Ref="C73"  Part="1" 
 AR Path="/56590966/5659191C/565DFEBA" Ref="C74"  Part="1" 
-F 0 "C73" H 9225 2750 50  0000 L CNN
+F 0 "C74" H 9225 2750 50  0000 L CNN
 F 1 "100n" H 9225 2550 50  0000 L CNN
 F 2 "stmbl:C_0603" H 9238 2500 30  0001 C CNN
 F 3 "" H 9200 2650 60  0000 C CNN
@@ -178,12 +178,12 @@ F 8 "X7R" H 9200 2650 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0126
+L stmbl:GND #PWR0126
 U 1 1 565DFEC1
 P 8150 3150
 AR Path="/56590966/565F7162/565DFEC1" Ref="#PWR0126"  Part="1" 
 AR Path="/56590966/5659191C/565DFEC1" Ref="#PWR0106"  Part="1" 
-F 0 "#PWR0126" H 8150 2900 50  0001 C CNN
+F 0 "#PWR0106" H 8150 2900 50  0001 C CNN
 F 1 "GND" H 8150 3000 50  0000 C CNN
 F 2 "" H 8150 3150 60  0000 C CNN
 F 3 "" H 8150 3150 60  0000 C CNN
@@ -195,13 +195,13 @@ D36
 Text HLabel 8650 2650 2    60   Input ~ 0
 E36
 $Comp
-L stmbl_4.0-rescue:SP3485EN-RESCUE-stmbl_4.0 U19
+L stmbl:SP3485 U19
 U 1 1 565DFED0
 P 8150 4050
 AR Path="/56590966/565F7162/565DFED0" Ref="U19"  Part="1" 
 AR Path="/56590966/5659191C/565DFED0" Ref="U18"  Part="1" 
 AR Path="/565DFED0" Ref="U19"  Part="1" 
-F 0 "U19" H 7850 4400 50  0000 L CNN
+F 0 "U18" H 7850 4400 50  0000 L CNN
 F 1 "SN65176B" H 8250 4400 50  0000 L CNN
 F 2 "stmbl:SOIC-8-N" H 8150 4050 50  0000 C CIN
 F 3 "" H 8150 4050 60  0000 C CNN
@@ -214,12 +214,12 @@ F 8 "" H 8150 4050 60  0001 C CNN "Tolerance"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R113
+L stmbl:R R113
 U 1 1 565DFED7
 P 7600 4050
 AR Path="/56590966/565F7162/565DFED7" Ref="R113"  Part="1" 
 AR Path="/56590966/5659191C/565DFED7" Ref="R114"  Part="1" 
-F 0 "R113" V 7680 4050 50  0000 C CNN
+F 0 "R114" V 7680 4050 50  0000 C CNN
 F 1 "120" V 7600 4050 50  0000 C CNN
 F 2 "stmbl:R_0603" V 7530 4050 30  0001 C CNN
 F 3 "" H 7600 4050 30  0000 C CNN
@@ -232,12 +232,12 @@ F 8 "1%" H 7600 4050 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C76
+L stmbl:C C76
 U 1 1 565DFEDE
 P 9200 4050
 AR Path="/56590966/565F7162/565DFEDE" Ref="C76"  Part="1" 
 AR Path="/56590966/5659191C/565DFEDE" Ref="C75"  Part="1" 
-F 0 "C76" H 9225 4150 50  0000 L CNN
+F 0 "C75" H 9225 4150 50  0000 L CNN
 F 1 "100n" H 9225 3950 50  0000 L CNN
 F 2 "stmbl:C_0603" H 9238 3900 30  0001 C CNN
 F 3 "" H 9200 4050 60  0000 C CNN
@@ -250,12 +250,12 @@ F 8 "X7R" H 9200 4050 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0127
+L stmbl:GND #PWR0127
 U 1 1 565DFEE5
 P 8150 4550
 AR Path="/56590966/565F7162/565DFEE5" Ref="#PWR0127"  Part="1" 
 AR Path="/56590966/5659191C/565DFEE5" Ref="#PWR0107"  Part="1" 
-F 0 "#PWR0127" H 8150 4300 50  0001 C CNN
+F 0 "#PWR0107" H 8150 4300 50  0001 C CNN
 F 1 "GND" H 8150 4400 50  0000 C CNN
 F 2 "" H 8150 4550 60  0000 C CNN
 F 3 "" H 8150 4550 60  0000 C CNN
@@ -267,12 +267,12 @@ D45
 Text HLabel 8650 4050 2    60   Input ~ 0
 E45
 $Comp
-L stmbl1:GND #PWR0128
+L stmbl:GND #PWR0128
 U 1 1 565DFF98
 P 800 3800
 AR Path="/56590966/565F7162/565DFF98" Ref="#PWR0128"  Part="1" 
 AR Path="/56590966/5659191C/565DFF98" Ref="#PWR0108"  Part="1" 
-F 0 "#PWR0128" H 800 3550 50  0001 C CNN
+F 0 "#PWR0108" H 800 3550 50  0001 C CNN
 F 1 "GND" H 800 3650 50  0000 C CNN
 F 2 "" H 800 3800 60  0000 C CNN
 F 3 "" H 800 3800 60  0000 C CNN
@@ -280,12 +280,12 @@ F 3 "" H 800 3800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0129
+L stmbl:GND #PWR0129
 U 1 1 565DFF9E
 P 800 3100
 AR Path="/56590966/565F7162/565DFF9E" Ref="#PWR0129"  Part="1" 
 AR Path="/56590966/5659191C/565DFF9E" Ref="#PWR0109"  Part="1" 
-F 0 "#PWR0129" H 800 2850 50  0001 C CNN
+F 0 "#PWR0109" H 800 2850 50  0001 C CNN
 F 1 "GND" H 800 2950 50  0000 C CNN
 F 2 "" H 800 3100 60  0000 C CNN
 F 3 "" H 800 3100 60  0000 C CNN
@@ -293,12 +293,12 @@ F 3 "" H 800 3100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R4
+L stmbl:R R4
 U 1 1 565DFFA4
 P 1000 3050
 AR Path="/56590966/565F7162/565DFFA4" Ref="R4"  Part="1" 
 AR Path="/56590966/5659191C/565DFFA4" Ref="R3"  Part="1" 
-F 0 "R4" V 1080 3050 50  0000 C CNN
+F 0 "R3" V 1080 3050 50  0000 C CNN
 F 1 "470" V 1000 3050 50  0000 C CNN
 F 2 "stmbl:R_0603" V 930 3050 30  0001 C CNN
 F 3 "" H 1000 3050 30  0000 C CNN
@@ -311,12 +311,12 @@ F 8 "1%" H 1000 3050 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R5
+L stmbl:R R5
 U 1 1 565DFFAB
 P 1000 3750
 AR Path="/56590966/565F7162/565DFFAB" Ref="R5"  Part="1" 
 AR Path="/56590966/5659191C/565DFFAB" Ref="R6"  Part="1" 
-F 0 "R5" V 1080 3750 50  0000 C CNN
+F 0 "R6" V 1080 3750 50  0000 C CNN
 F 1 "470" V 1000 3750 50  0000 C CNN
 F 2 "stmbl:R_0603" V 930 3750 30  0001 C CNN
 F 3 "" H 1000 3750 30  0000 C CNN
@@ -333,12 +333,12 @@ L1
 Text HLabel 1150 3650 0    60   Input ~ 0
 L2
 $Comp
-L stmbl1:GND #PWR0130
+L stmbl:GND #PWR0130
 U 1 1 565E0460
 P 4900 6050
 AR Path="/56590966/565F7162/565E0460" Ref="#PWR0130"  Part="1" 
 AR Path="/56590966/5659191C/565E0460" Ref="#PWR0110"  Part="1" 
-F 0 "#PWR0130" H 4900 5800 50  0001 C CNN
+F 0 "#PWR0110" H 4900 5800 50  0001 C CNN
 F 1 "GND" H 4900 5900 50  0000 C CNN
 F 2 "" H 4900 6050 60  0000 C CNN
 F 3 "" H 4900 6050 60  0000 C CNN
@@ -346,12 +346,12 @@ F 3 "" H 4900 6050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R41
+L stmbl:R R41
 U 1 1 565E07F5
 P 4150 4350
 AR Path="/56590966/565F7162/565E07F5" Ref="R41"  Part="1" 
 AR Path="/56590966/5659191C/565E07F5" Ref="R42"  Part="1" 
-F 0 "R41" V 4230 4350 50  0000 C CNN
+F 0 "R42" V 4230 4350 50  0000 C CNN
 F 1 "10k" V 4150 4350 50  0000 C CNN
 F 2 "stmbl:R_0603" V 4080 4350 30  0001 C CNN
 F 3 "" H 4150 4350 30  0000 C CNN
@@ -364,12 +364,12 @@ F 8 "1%" H 4150 4350 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R43
+L stmbl:R R43
 U 1 1 565E0878
 P 4150 4650
 AR Path="/56590966/565F7162/565E0878" Ref="R43"  Part="1" 
 AR Path="/56590966/5659191C/565E0878" Ref="R44"  Part="1" 
-F 0 "R43" V 4230 4650 50  0000 C CNN
+F 0 "R44" V 4230 4650 50  0000 C CNN
 F 1 "10k" V 4150 4650 50  0000 C CNN
 F 2 "stmbl:R_0603" V 4080 4650 30  0001 C CNN
 F 3 "" H 4150 4650 30  0000 C CNN
@@ -382,12 +382,12 @@ F 8 "1%" H 4150 4650 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R48
+L stmbl:R R48
 U 1 1 565E0919
 P 4350 4100
 AR Path="/56590966/565F7162/565E0919" Ref="R48"  Part="1" 
 AR Path="/56590966/5659191C/565E0919" Ref="R47"  Part="1" 
-F 0 "R48" V 4430 4100 50  0000 C CNN
+F 0 "R47" V 4430 4100 50  0000 C CNN
 F 1 "15k" V 4350 4100 50  0000 C CNN
 F 2 "stmbl:R_0603" V 4280 4100 30  0001 C CNN
 F 3 "" H 4350 4100 30  0000 C CNN
@@ -400,12 +400,12 @@ F 8 "1%" H 4350 4100 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R54
+L stmbl:R R54
 U 1 1 565E098D
 P 4600 4850
 AR Path="/56590966/565F7162/565E098D" Ref="R54"  Part="1" 
 AR Path="/56590966/5659191C/565E098D" Ref="R55"  Part="1" 
-F 0 "R54" V 4680 4850 50  0000 C CNN
+F 0 "R55" V 4680 4850 50  0000 C CNN
 F 1 "15k" V 4600 4850 50  0000 C CNN
 F 2 "stmbl:R_0603" V 4530 4850 30  0001 C CNN
 F 3 "" H 4600 4850 30  0000 C CNN
@@ -418,12 +418,12 @@ F 8 "1%" H 4600 4850 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R87
+L stmbl:R R87
 U 1 1 565E236D
 P 5850 4500
 AR Path="/56590966/565F7162/565E236D" Ref="R87"  Part="1" 
 AR Path="/56590966/5659191C/565E236D" Ref="R86"  Part="1" 
-F 0 "R87" V 5930 4500 50  0000 C CNN
+F 0 "R86" V 5930 4500 50  0000 C CNN
 F 1 "22" V 5850 4500 50  0000 C CNN
 F 2 "stmbl:R_0603" V 5780 4500 30  0001 C CNN
 F 3 "" H 5850 4500 30  0000 C CNN
@@ -436,12 +436,12 @@ F 8 "1%" H 5850 4500 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R94
+L stmbl:R R94
 U 1 1 565E23EB
 P 6200 4750
 AR Path="/56590966/565F7162/565E23EB" Ref="R94"  Part="1" 
 AR Path="/56590966/5659191C/565E23EB" Ref="R93"  Part="1" 
-F 0 "R94" V 6280 4750 50  0000 C CNN
+F 0 "R93" V 6280 4750 50  0000 C CNN
 F 1 "470" V 6200 4750 50  0000 C CNN
 F 2 "stmbl:R_0603" V 6130 4750 30  0001 C CNN
 F 3 "" H 6200 4750 30  0000 C CNN
@@ -454,12 +454,12 @@ F 8 "1%" H 6200 4750 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C46
+L stmbl:C C46
 U 1 1 565E24CA
 P 6000 4750
 AR Path="/56590966/565F7162/565E24CA" Ref="C46"  Part="1" 
 AR Path="/56590966/5659191C/565E24CA" Ref="C47"  Part="1" 
-F 0 "C46" H 6025 4850 50  0000 L CNN
+F 0 "C47" H 6025 4850 50  0000 L CNN
 F 1 "1n" H 6025 4650 50  0000 L CNN
 F 2 "stmbl:C_0603" H 6038 4600 30  0001 C CNN
 F 3 "" H 6000 4750 60  0000 C CNN
@@ -472,12 +472,12 @@ F 8 "X7R" H 6000 4750 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0131
+L stmbl:GND #PWR0131
 U 1 1 565E2823
 P 6100 5000
 AR Path="/56590966/565F7162/565E2823" Ref="#PWR0131"  Part="1" 
 AR Path="/56590966/5659191C/565E2823" Ref="#PWR0111"  Part="1" 
-F 0 "#PWR0131" H 6100 4750 50  0001 C CNN
+F 0 "#PWR0111" H 6100 4750 50  0001 C CNN
 F 1 "GND" H 6100 4850 50  0000 C CNN
 F 2 "" H 6100 5000 60  0000 C CNN
 F 3 "" H 6100 5000 60  0000 C CNN
@@ -487,12 +487,12 @@ $EndComp
 Text HLabel 6200 4500 2    60   Input ~ 0
 A12
 $Comp
-L stmbl1:R R37
+L stmbl:R R37
 U 1 1 565E2D07
 P 4050 5450
 AR Path="/56590966/565F7162/565E2D07" Ref="R37"  Part="1" 
 AR Path="/56590966/5659191C/565E2D07" Ref="R36"  Part="1" 
-F 0 "R37" V 4130 5450 50  0000 C CNN
+F 0 "R36" V 4130 5450 50  0000 C CNN
 F 1 "10k" V 4050 5450 50  0000 C CNN
 F 2 "stmbl:R_0603" V 3980 5450 30  0001 C CNN
 F 3 "" H 4050 5450 30  0000 C CNN
@@ -505,12 +505,12 @@ F 8 "1%" H 4050 5450 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R38
+L stmbl:R R38
 U 1 1 565E2D0D
 P 4050 5750
 AR Path="/56590966/565F7162/565E2D0D" Ref="R38"  Part="1" 
 AR Path="/56590966/5659191C/565E2D0D" Ref="R39"  Part="1" 
-F 0 "R38" V 4130 5750 50  0000 C CNN
+F 0 "R39" V 4130 5750 50  0000 C CNN
 F 1 "10k" V 4050 5750 50  0000 C CNN
 F 2 "stmbl:R_0603" V 3980 5750 30  0001 C CNN
 F 3 "" H 4050 5750 30  0000 C CNN
@@ -523,12 +523,12 @@ F 8 "1%" H 4050 5750 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R49
+L stmbl:R R49
 U 1 1 565E2D13
 P 4300 5200
 AR Path="/56590966/565F7162/565E2D13" Ref="R49"  Part="1" 
 AR Path="/56590966/5659191C/565E2D13" Ref="R50"  Part="1" 
-F 0 "R49" V 4380 5200 50  0000 C CNN
+F 0 "R50" V 4380 5200 50  0000 C CNN
 F 1 "15k" V 4300 5200 50  0000 C CNN
 F 2 "stmbl:R_0603" V 4230 5200 30  0001 C CNN
 F 3 "" H 4300 5200 30  0000 C CNN
@@ -541,12 +541,12 @@ F 8 "1%" H 4300 5200 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R57
+L stmbl:R R57
 U 1 1 565E2D19
 P 4600 5950
 AR Path="/56590966/565F7162/565E2D19" Ref="R57"  Part="1" 
 AR Path="/56590966/5659191C/565E2D19" Ref="R56"  Part="1" 
-F 0 "R57" V 4680 5950 50  0000 C CNN
+F 0 "R56" V 4680 5950 50  0000 C CNN
 F 1 "15k" V 4600 5950 50  0000 C CNN
 F 2 "stmbl:R_0603" V 4530 5950 30  0001 C CNN
 F 3 "" H 4600 5950 30  0000 C CNN
@@ -559,12 +559,12 @@ F 8 "1%" H 4600 5950 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R88
+L stmbl:R R88
 U 1 1 565E32C5
 P 5850 5600
 AR Path="/56590966/565F7162/565E32C5" Ref="R88"  Part="1" 
 AR Path="/56590966/5659191C/565E32C5" Ref="R89"  Part="1" 
-F 0 "R88" V 5930 5600 50  0000 C CNN
+F 0 "R89" V 5930 5600 50  0000 C CNN
 F 1 "22" V 5850 5600 50  0000 C CNN
 F 2 "stmbl:R_0603" V 5780 5600 30  0001 C CNN
 F 3 "" H 5850 5600 30  0000 C CNN
@@ -577,12 +577,12 @@ F 8 "1%" H 5850 5600 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R96
+L stmbl:R R96
 U 1 1 565E32CB
 P 6200 5850
 AR Path="/56590966/565F7162/565E32CB" Ref="R96"  Part="1" 
 AR Path="/56590966/5659191C/565E32CB" Ref="R95"  Part="1" 
-F 0 "R96" V 6280 5850 50  0000 C CNN
+F 0 "R95" V 6280 5850 50  0000 C CNN
 F 1 "470" V 6200 5850 50  0000 C CNN
 F 2 "stmbl:R_0603" V 6130 5850 30  0001 C CNN
 F 3 "" H 6200 5850 30  0000 C CNN
@@ -595,12 +595,12 @@ F 8 "1%" H 6200 5850 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C49
+L stmbl:C C49
 U 1 1 565E32D1
 P 6000 5850
 AR Path="/56590966/565F7162/565E32D1" Ref="C49"  Part="1" 
 AR Path="/56590966/5659191C/565E32D1" Ref="C48"  Part="1" 
-F 0 "C49" H 6025 5950 50  0000 L CNN
+F 0 "C48" H 6025 5950 50  0000 L CNN
 F 1 "1n" H 6025 5750 50  0000 L CNN
 F 2 "stmbl:C_0603" H 6038 5700 30  0001 C CNN
 F 3 "" H 6000 5850 60  0000 C CNN
@@ -613,12 +613,12 @@ F 8 "X7R" H 6000 5850 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0132
+L stmbl:GND #PWR0132
 U 1 1 565E32DB
 P 6100 6100
 AR Path="/56590966/565F7162/565E32DB" Ref="#PWR0132"  Part="1" 
 AR Path="/56590966/5659191C/565E32DB" Ref="#PWR0112"  Part="1" 
-F 0 "#PWR0132" H 6100 5850 50  0001 C CNN
+F 0 "#PWR0112" H 6100 5850 50  0001 C CNN
 F 1 "GND" H 6100 5950 50  0000 C CNN
 F 2 "" H 6100 6100 60  0000 C CNN
 F 3 "" H 6100 6100 60  0000 C CNN
@@ -628,12 +628,12 @@ $EndComp
 Text HLabel 6200 5600 2    60   Input ~ 0
 A35
 $Comp
-L stmbl1:GND #PWR0133
+L stmbl:GND #PWR0133
 U 1 1 565E3A5A
 P 2600 7150
 AR Path="/56590966/565F7162/565E3A5A" Ref="#PWR0133"  Part="1" 
 AR Path="/56590966/5659191C/565E3A5A" Ref="#PWR0113"  Part="1" 
-F 0 "#PWR0133" H 2600 6900 50  0001 C CNN
+F 0 "#PWR0113" H 2600 6900 50  0001 C CNN
 F 1 "GND" H 2600 7000 50  0000 C CNN
 F 2 "" H 2600 7150 60  0000 C CNN
 F 3 "" H 2600 7150 60  0000 C CNN
@@ -641,12 +641,12 @@ F 3 "" H 2600 7150 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R23
+L stmbl:R R23
 U 1 1 565E3AE9
 P 2500 5900
 AR Path="/56590966/565F7162/565E3AE9" Ref="R23"  Part="1" 
 AR Path="/56590966/5659191C/565E3AE9" Ref="R24"  Part="1" 
-F 0 "R23" V 2580 5900 50  0000 C CNN
+F 0 "R24" V 2580 5900 50  0000 C CNN
 F 1 "120" V 2500 5900 50  0000 C CNN
 F 2 "stmbl:R_0603" V 2430 5900 30  0001 C CNN
 F 3 "" H 2500 5900 30  0000 C CNN
@@ -659,12 +659,12 @@ F 8 "1%" H 2500 5900 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R26
+L stmbl:R R26
 U 1 1 565E3BA8
 P 2500 6800
 AR Path="/56590966/565F7162/565E3BA8" Ref="R26"  Part="1" 
 AR Path="/56590966/5659191C/565E3BA8" Ref="R25"  Part="1" 
-F 0 "R26" V 2580 6800 50  0000 C CNN
+F 0 "R25" V 2580 6800 50  0000 C CNN
 F 1 "120" V 2500 6800 50  0000 C CNN
 F 2 "stmbl:R_0603" V 2430 6800 30  0001 C CNN
 F 3 "" H 2500 6800 30  0000 C CNN
@@ -677,12 +677,12 @@ F 8 "1%" H 2500 6800 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C12
+L stmbl:C C12
 U 1 1 565E3C38
 P 2700 6800
 AR Path="/56590966/565F7162/565E3C38" Ref="C12"  Part="1" 
 AR Path="/56590966/5659191C/565E3C38" Ref="C13"  Part="1" 
-F 0 "C12" H 2725 6900 50  0000 L CNN
+F 0 "C13" H 2725 6900 50  0000 L CNN
 F 1 "100n" H 2725 6700 50  0000 L CNN
 F 2 "stmbl:C_0603" H 2738 6650 30  0001 C CNN
 F 3 "" H 2700 6800 60  0000 C CNN
@@ -695,12 +695,12 @@ F 8 "X7R" H 2700 6800 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C37
+L stmbl:C C37
 U 1 1 565E1292
 P 3100 5750
 AR Path="/56590966/565F7162/565E1292" Ref="C37"  Part="1" 
 AR Path="/56590966/5659191C/565E1292" Ref="C36"  Part="1" 
-F 0 "C37" H 3125 5850 50  0000 L CNN
+F 0 "C36" H 3125 5850 50  0000 L CNN
 F 1 "100n" H 3125 5650 50  0000 L CNN
 F 2 "stmbl:C_0603" H 3138 5600 30  0001 C CNN
 F 3 "" H 3100 5750 60  0000 C CNN
@@ -713,12 +713,12 @@ F 8 "X7R" H 3100 5750 60  0001 C CNN "Tolerance"
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:C C24
+L stmbl:C C24
 U 1 1 565E18D1
 P 4300 5600
 AR Path="/56590966/565F7162/565E18D1" Ref="C24"  Part="1" 
 AR Path="/56590966/5659191C/565E18D1" Ref="C25"  Part="1" 
-F 0 "C24" H 4325 5700 50  0000 L CNN
+F 0 "C25" H 4325 5700 50  0000 L CNN
 F 1 "18p" H 4325 5500 50  0000 L CNN
 F 2 "stmbl:C_0603" H 4338 5450 30  0001 C CNN
 F 3 "" H 4300 5600 60  0000 C CNN
@@ -731,12 +731,12 @@ F 8 "X7R" H 4300 5600 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0134
+L stmbl:GND #PWR0134
 U 1 1 565F7D3D
 P 2300 4250
 AR Path="/56590966/565F7162/565F7D3D" Ref="#PWR0134"  Part="1" 
 AR Path="/56590966/5659191C/565F7D3D" Ref="#PWR0114"  Part="1" 
-F 0 "#PWR0134" H 2300 4000 50  0001 C CNN
+F 0 "#PWR0114" H 2300 4000 50  0001 C CNN
 F 1 "GND" H 2300 4100 50  0000 C CNN
 F 2 "" H 2300 4250 60  0000 C CNN
 F 3 "" H 2300 4250 60  0000 C CNN
@@ -965,12 +965,12 @@ Wire Wire Line
 	4450 5950 4450 5750
 Connection ~ 4450 5750
 $Comp
-L stmbl1:C C26
+L stmbl:C C26
 U 1 1 565FB16C
 P 4350 4500
 AR Path="/56590966/565F7162/565FB16C" Ref="C26"  Part="1" 
 AR Path="/56590966/5659191C/565FB16C" Ref="C27"  Part="1" 
-F 0 "C26" H 4375 4600 50  0000 L CNN
+F 0 "C27" H 4375 4600 50  0000 L CNN
 F 1 "18p" H 4375 4400 50  0000 L CNN
 F 2 "stmbl:C_0603" H 4388 4350 30  0001 C CNN
 F 3 "" H 4350 4500 60  0000 C CNN
@@ -1014,12 +1014,12 @@ Connection ~ 3600 3550
 Text Notes 6350 5200 0    60   ~ 0
 LM358 max. output: 4.94V - 1.5V = 3.44V\nSTM32 max. input: 3.44V / (22 + 470) * 470 = 3.28V
 $Comp
-L stmbl1:R R124
+L stmbl:R R124
 U 1 1 57756B74
 P 9550 1450
 AR Path="/56590966/565F7162/57756B74" Ref="R124"  Part="1" 
 AR Path="/56590966/5659191C/57756B74" Ref="R123"  Part="1" 
-F 0 "R124" V 9630 1450 50  0000 C CNN
+F 0 "R123" V 9630 1450 50  0000 C CNN
 F 1 "1k" V 9550 1450 50  0000 C CNN
 F 2 "stmbl:R_0603" V 9480 1450 30  0001 C CNN
 F 3 "" H 9550 1450 30  0000 C CNN
@@ -1034,12 +1034,12 @@ $EndComp
 Text HLabel 9600 1250 2    60   Input ~ 0
 E12
 $Comp
-L stmbl1:GND #PWR0115
+L stmbl:GND #PWR0115
 U 1 1 57756CDC
 P 9550 1650
 AR Path="/56590966/5659191C/57756CDC" Ref="#PWR0115"  Part="1" 
 AR Path="/56590966/565F7162/57756CDC" Ref="#PWR0135"  Part="1" 
-F 0 "#PWR0135" H 9550 1400 50  0001 C CNN
+F 0 "#PWR0115" H 9550 1400 50  0001 C CNN
 F 1 "GND" H 9550 1500 50  0000 C CNN
 F 2 "" H 9550 1650 60  0000 C CNN
 F 3 "" H 9550 1650 60  0000 C CNN
@@ -1053,12 +1053,12 @@ Wire Wire Line
 Wire Wire Line
 	9550 1600 9550 1650
 $Comp
-L stmbl1:R R125
+L stmbl:R R125
 U 1 1 57757310
 P 9550 2850
 AR Path="/56590966/5659191C/57757310" Ref="R125"  Part="1" 
 AR Path="/56590966/565F7162/57757310" Ref="R126"  Part="1" 
-F 0 "R126" V 9630 2850 50  0000 C CNN
+F 0 "R125" V 9630 2850 50  0000 C CNN
 F 1 "1k" V 9550 2850 50  0000 C CNN
 F 2 "stmbl:R_0603" V 9480 2850 30  0001 C CNN
 F 3 "" H 9550 2850 30  0000 C CNN
@@ -1071,12 +1071,12 @@ F 8 "1%" H 9550 2850 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0116
+L stmbl:GND #PWR0116
 U 1 1 57757316
 P 9550 3050
 AR Path="/56590966/5659191C/57757316" Ref="#PWR0116"  Part="1" 
 AR Path="/56590966/565F7162/57757316" Ref="#PWR0136"  Part="1" 
-F 0 "#PWR0136" H 9550 2800 50  0001 C CNN
+F 0 "#PWR0116" H 9550 2800 50  0001 C CNN
 F 1 "GND" H 9550 2900 50  0000 C CNN
 F 2 "" H 9550 3050 60  0000 C CNN
 F 3 "" H 9550 3050 60  0000 C CNN
@@ -1090,12 +1090,12 @@ Wire Wire Line
 Wire Wire Line
 	9550 3000 9550 3050
 $Comp
-L stmbl1:R R128
+L stmbl:R R128
 U 1 1 57757D9E
 P 9550 4250
 AR Path="/56590966/5659191C/57757D9E" Ref="R128"  Part="1" 
 AR Path="/56590966/565F7162/57757D9E" Ref="R127"  Part="1" 
-F 0 "R127" V 9630 4250 50  0000 C CNN
+F 0 "R128" V 9630 4250 50  0000 C CNN
 F 1 "1k" V 9550 4250 50  0000 C CNN
 F 2 "stmbl:R_0603" V 9480 4250 30  0001 C CNN
 F 3 "" H 9550 4250 30  0000 C CNN
@@ -1108,12 +1108,12 @@ F 8 "1%" H 9550 4250 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0117
+L stmbl:GND #PWR0117
 U 1 1 57757DA4
 P 9550 4450
 AR Path="/56590966/5659191C/57757DA4" Ref="#PWR0117"  Part="1" 
 AR Path="/56590966/565F7162/57757DA4" Ref="#PWR0137"  Part="1" 
-F 0 "#PWR0137" H 9550 4200 50  0001 C CNN
+F 0 "#PWR0117" H 9550 4200 50  0001 C CNN
 F 1 "GND" H 9550 4300 50  0000 C CNN
 F 2 "" H 9550 4450 60  0000 C CNN
 F 3 "" H 9550 4450 60  0000 C CNN
@@ -1149,12 +1149,12 @@ Wire Wire Line
 Wire Wire Line
 	1700 7050 2500 7050
 $Comp
-L stmbl1:INDUCTOR L8
+L stmbl:INDUCTOR L8
 U 1 1 57ADE969
 P 2100 5250
 AR Path="/56590966/5659191C/57ADE969" Ref="L8"  Part="1" 
 AR Path="/56590966/565F7162/57ADE969" Ref="L10"  Part="1" 
-F 0 "L10" V 2050 5250 50  0000 C CNN
+F 0 "L8" V 2050 5250 50  0000 C CNN
 F 1 "220r 700mA" V 2200 5250 50  0000 C CNN
 F 2 "stmbl:R_0603" H 2100 5250 50  0001 C CNN
 F 3 "" H 2100 5250 50  0000 C CNN
@@ -1178,12 +1178,12 @@ Wire Wire Line
 	4700 5100 4900 5100
 Connection ~ 2500 5250
 $Comp
-L stmbl1:C C116
+L stmbl:C C116
 U 1 1 57ADFEE4
 P 1700 5500
 AR Path="/56590966/565F7162/57ADFEE4" Ref="C116"  Part="1" 
 AR Path="/56590966/5659191C/57ADFEE4" Ref="C113"  Part="1" 
-F 0 "C116" H 1725 5600 50  0000 L CNN
+F 0 "C113" H 1725 5600 50  0000 L CNN
 F 1 "100n" H 1725 5400 50  0000 L CNN
 F 2 "stmbl:C_0603" H 1738 5350 30  0001 C CNN
 F 3 "" H 1700 5500 60  0000 C CNN
@@ -1200,12 +1200,12 @@ Wire Wire Line
 Connection ~ 2500 7050
 Connection ~ 1700 5250
 $Comp
-L stmbl1:INDUCTOR L11
+L stmbl:INDUCTOR L11
 U 1 1 57AE2C95
 P 10300 800
 AR Path="/56590966/565F7162/57AE2C95" Ref="L11"  Part="1" 
 AR Path="/56590966/5659191C/57AE2C95" Ref="L9"  Part="1" 
-F 0 "L11" V 10250 800 50  0000 C CNN
+F 0 "L9" V 10250 800 50  0000 C CNN
 F 1 "220r 700mA" V 10400 800 50  0000 C CNN
 F 2 "stmbl:R_0603" H 10300 800 50  0001 C CNN
 F 3 "" H 10300 800 50  0000 C CNN
@@ -1222,12 +1222,12 @@ Wire Wire Line
 Wire Wire Line
 	10700 800  10600 800 
 $Comp
-L stmbl1:C C118
+L stmbl:C C118
 U 1 1 57AE2C9D
 P 10700 1050
 AR Path="/56590966/565F7162/57AE2C9D" Ref="C118"  Part="1" 
 AR Path="/56590966/5659191C/57AE2C9D" Ref="C115"  Part="1" 
-F 0 "C118" H 10725 1150 50  0000 L CNN
+F 0 "C115" H 10725 1150 50  0000 L CNN
 F 1 "100n" H 10725 950 50  0000 L CNN
 F 2 "stmbl:C_0603" H 10738 900 30  0001 C CNN
 F 3 "" H 10700 1050 60  0000 C CNN
@@ -1248,12 +1248,12 @@ Connection ~ 9900 800
 Connection ~ 9900 2200
 Connection ~ 9200 3600
 $Comp
-L stmbl1:GND #PWR0138
+L stmbl:GND #PWR0138
 U 1 1 57AE38CA
 P 10700 1300
 AR Path="/56590966/565F7162/57AE38CA" Ref="#PWR0138"  Part="1" 
 AR Path="/56590966/5659191C/57AE38CA" Ref="#PWR0118"  Part="1" 
-F 0 "#PWR0138" H 10700 1050 50  0001 C CNN
+F 0 "#PWR0118" H 10700 1050 50  0001 C CNN
 F 1 "GND" H 10700 1150 50  0000 C CNN
 F 2 "" H 10700 1300 60  0000 C CNN
 F 3 "" H 10700 1300 60  0000 C CNN
@@ -1263,12 +1263,12 @@ $EndComp
 Wire Wire Line
 	10700 1300 10700 1200
 $Comp
-L stmbl1:R R130
+L stmbl:R R130
 U 1 1 57B0307F
 P 2500 5500
 AR Path="/56590966/5659191C/57B0307F" Ref="R130"  Part="1" 
 AR Path="/56590966/565F7162/57B0307F" Ref="R131"  Part="1" 
-F 0 "R131" V 2580 5500 50  0000 C CNN
+F 0 "R130" V 2580 5500 50  0000 C CNN
 F 1 "120" V 2500 5500 50  0000 C CNN
 F 2 "stmbl:R_0603" V 2430 5500 30  0001 C CNN
 F 3 "" H 2500 5500 30  0000 C CNN
@@ -1287,12 +1287,12 @@ Wire Wire Line
 Wire Wire Line
 	2300 3750 2300 4150
 $Comp
-L stmbl1:C C117
+L stmbl:C C117
 U 1 1 57B0D6F6
 P 2500 3900
 AR Path="/56590966/565F7162/57B0D6F6" Ref="C117"  Part="1" 
 AR Path="/56590966/5659191C/57B0D6F6" Ref="C114"  Part="1" 
-F 0 "C117" H 2525 4000 50  0000 L CNN
+F 0 "C114" H 2525 4000 50  0000 L CNN
 F 1 "100n" H 2525 3800 50  0000 L CNN
 F 2 "stmbl:C_0603" H 2538 3750 30  0001 C CNN
 F 3 "" H 2500 3900 60  0000 C CNN
@@ -1313,12 +1313,12 @@ Wire Wire Line
 	2500 4150 2300 4150
 Connection ~ 2300 4150
 $Comp
-L stmbl1:+5F #PWR0119
+L stmbl:+5F #PWR0119
 U 1 1 57D7260E
 P 10700 700
 AR Path="/56590966/5659191C/57D7260E" Ref="#PWR0119"  Part="1" 
 AR Path="/56590966/565F7162/57D7260E" Ref="#PWR0139"  Part="1" 
-F 0 "#PWR0139" H 10700 550 50  0001 C CNN
+F 0 "#PWR0119" H 10700 550 50  0001 C CNN
 F 1 "+5F" H 10700 840 50  0000 C CNN
 F 2 "" H 10700 700 50  0000 C CNN
 F 3 "" H 10700 700 50  0000 C CNN
@@ -1326,12 +1326,12 @@ F 3 "" H 10700 700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+12V #PWR0120
+L stmbl:+12V #PWR0120
 U 1 1 57D5E0C8
 P 3200 3750
 AR Path="/56590966/5659191C/57D5E0C8" Ref="#PWR0120"  Part="1" 
 AR Path="/56590966/565F7162/57D5E0C8" Ref="#PWR0140"  Part="1" 
-F 0 "#PWR0140" H 3200 3600 50  0001 C CNN
+F 0 "#PWR0120" H 3200 3600 50  0001 C CNN
 F 1 "+12V" H 3200 3890 50  0000 C CNN
 F 2 "" H 3200 3750 50  0000 C CNN
 F 3 "" H 3200 3750 50  0000 C CNN
@@ -1339,12 +1339,12 @@ F 3 "" H 3200 3750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+5F #PWR0121
+L stmbl:+5F #PWR0121
 U 1 1 57D5E166
 P 3200 4450
 AR Path="/56590966/5659191C/57D5E166" Ref="#PWR0121"  Part="1" 
 AR Path="/56590966/565F7162/57D5E166" Ref="#PWR0141"  Part="1" 
-F 0 "#PWR0141" H 3200 4300 50  0001 C CNN
+F 0 "#PWR0121" H 3200 4300 50  0001 C CNN
 F 1 "+5F" H 3200 4590 50  0000 C CNN
 F 2 "" H 3200 4450 50  0000 C CNN
 F 3 "" H 3200 4450 50  0000 C CNN
@@ -1360,12 +1360,12 @@ Wire Wire Line
 Wire Wire Line
 	2750 4100 2950 4100
 $Comp
-L stmbl1:R R137
+L stmbl:R R137
 U 1 1 57D5E6AA
 P 2950 4250
 AR Path="/56590966/5659191C/57D5E6AA" Ref="R137"  Part="1" 
 AR Path="/56590966/565F7162/57D5E6AA" Ref="R140"  Part="1" 
-F 0 "R140" V 3030 4250 50  0000 C CNN
+F 0 "R137" V 3030 4250 50  0000 C CNN
 F 1 "10k" V 2950 4250 50  0000 C CNN
 F 2 "stmbl:R_0603" V 2880 4250 30  0001 C CNN
 F 3 "" H 2950 4250 30  0000 C CNN
@@ -1382,12 +1382,12 @@ Wire Wire Line
 Connection ~ 3200 4400
 Connection ~ 2950 4100
 $Comp
-L stmbl1:R R135
+L stmbl:R R135
 U 1 1 57D5F156
 P 2750 4250
 AR Path="/56590966/5659191C/57D5F156" Ref="R135"  Part="1" 
 AR Path="/56590966/565F7162/57D5F156" Ref="R138"  Part="1" 
-F 0 "R138" V 2830 4250 50  0000 C CNN
+F 0 "R135" V 2830 4250 50  0000 C CNN
 F 1 "10k" V 2750 4250 50  0000 C CNN
 F 2 "stmbl:R_0603" V 2680 4250 30  0001 C CNN
 F 3 "" H 2750 4250 30  0000 C CNN
@@ -1400,12 +1400,12 @@ F 8 "1%" H 2750 4250 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R136
+L stmbl:R R136
 U 1 1 57D5F335
 P 2750 4750
 AR Path="/56590966/5659191C/57D5F335" Ref="R136"  Part="1" 
 AR Path="/56590966/565F7162/57D5F335" Ref="R139"  Part="1" 
-F 0 "R139" V 2830 4750 50  0000 C CNN
+F 0 "R136" V 2830 4750 50  0000 C CNN
 F 1 "1k" V 2750 4750 50  0000 C CNN
 F 2 "stmbl:R_0603" V 2680 4750 30  0001 C CNN
 F 3 "" H 2750 4750 30  0000 C CNN
@@ -1420,12 +1420,12 @@ $EndComp
 Wire Wire Line
 	2750 4400 2750 4500
 $Comp
-L stmbl1:GND #PWR0122
+L stmbl:GND #PWR0122
 U 1 1 57D5F4E8
 P 2750 5000
 AR Path="/56590966/5659191C/57D5F4E8" Ref="#PWR0122"  Part="1" 
 AR Path="/56590966/565F7162/57D5F4E8" Ref="#PWR0142"  Part="1" 
-F 0 "#PWR0142" H 2750 4750 50  0001 C CNN
+F 0 "#PWR0122" H 2750 4750 50  0001 C CNN
 F 1 "GND" H 2750 4850 50  0000 C CNN
 F 2 "" H 2750 5000 60  0000 C CNN
 F 3 "" H 2750 5000 60  0000 C CNN
@@ -1440,12 +1440,12 @@ Wire Wire Line
 	2350 4500 2450 4500
 Connection ~ 2750 4500
 $Comp
-L stmbl1:C C125
+L stmbl:C C125
 U 1 1 57D74C8F
 P 2450 4750
 AR Path="/56590966/5659191C/57D74C8F" Ref="C125"  Part="1" 
 AR Path="/56590966/565F7162/57D74C8F" Ref="C126"  Part="1" 
-F 0 "C126" H 2475 4850 50  0000 L CNN
+F 0 "C125" H 2475 4850 50  0000 L CNN
 F 1 "100n" H 2475 4650 50  0000 L CNN
 F 2 "stmbl:C_0603" H 2488 4600 30  0001 C CNN
 F 3 "" H 2450 4750 60  0000 C CNN
@@ -1478,12 +1478,12 @@ Wire Wire Line
 Wire Wire Line
 	4600 5700 4600 5750
 $Comp
-L stmbl1:LM358 U7
+L stmbl:LM358 U7
 U 2 1 56591955
 P 5000 5600
 AR Path="/56590966/565F7162/56591955" Ref="U7"  Part="2" 
 AR Path="/56590966/5659191C/56591955" Ref="U6"  Part="2" 
-F 0 "U7" H 4950 5800 60  0000 L CNN
+F 0 "U6" H 4950 5800 60  0000 L CNN
 F 1 "LM358" H 4950 5350 60  0000 L CNN
 F 2 "stmbl:SOIC-8-N" H 5000 5600 60  0001 C CNN
 F 3 "" H 5000 5600 60  0000 C CNN
@@ -1504,12 +1504,12 @@ Wire Wire Line
 	3100 7050 3100 5900
 Connection ~ 2700 7050
 $Comp
-L stmbl1:GNDD #PWR0143
+L stmbl:GNDD #PWR0143
 U 1 1 57F83665
 P 1700 4100
 AR Path="/56590966/565F7162/57F83665" Ref="#PWR0143"  Part="1" 
 AR Path="/56590966/5659191C/57F83665" Ref="#PWR0123"  Part="1" 
-F 0 "#PWR0143" H 1700 3850 50  0001 C CNN
+F 0 "#PWR0123" H 1700 3850 50  0001 C CNN
 F 1 "GNDD" H 1700 3950 50  0000 C CNN
 F 2 "" H 1700 4100 50  0000 C CNN
 F 3 "" H 1700 4100 50  0000 C CNN
@@ -1519,12 +1519,12 @@ $EndComp
 Wire Wire Line
 	1700 4100 1700 4000
 $Comp
-L stmbl1:R R147
+L stmbl:R R147
 U 1 1 5810D912
 P 2500 6400
 AR Path="/56590966/5659191C/5810D912" Ref="R147"  Part="1" 
 AR Path="/56590966/565F7162/5810D912" Ref="R148"  Part="1" 
-F 0 "R148" V 2580 6400 50  0000 C CNN
+F 0 "R147" V 2580 6400 50  0000 C CNN
 F 1 "22" V 2500 6400 50  0000 C CNN
 F 2 "stmbl:R_0603" V 2430 6400 30  0001 C CNN
 F 3 "" H 2500 6400 30  0000 C CNN
@@ -1562,12 +1562,12 @@ Wire Wire Line
 Wire Wire Line
 	800  3750 850  3750
 $Comp
-L stmbl1:JUMPER3_NC JP2
+L stmbl:JUMPER3_NC JP2
 U 1 1 583384DA
 P 3200 4100
 AR Path="/56590966/5659191C/583384DA" Ref="JP2"  Part="1" 
 AR Path="/56590966/565F7162/583384DA" Ref="JP5"  Part="1" 
-F 0 "JP5" H 3250 4000 50  0000 L CNN
+F 0 "JP2" H 3250 4000 50  0000 L CNN
 F 1 "JUMPER3_NC" H 3200 4200 50  0000 C BNN
 F 2 "stmbl:SOLDER_JUMPER_3_NC" H 3200 4100 50  0001 C CNN
 F 3 "" H 3200 4100 50  0000 C CNN
@@ -1580,12 +1580,12 @@ F 8 "" H 3200 4100 50  0001 C CNN "Tolerance"
 	0    1    -1   0   
 $EndComp
 $Comp
-L stmbl1:+5VA #PWR0124
+L stmbl:+5VA #PWR0124
 U 1 1 5832987B
 P 1700 5150
 AR Path="/56590966/5659191C/5832987B" Ref="#PWR0124"  Part="1" 
 AR Path="/56590966/565F7162/5832987B" Ref="#PWR0144"  Part="1" 
-F 0 "#PWR0144" H 1700 5000 50  0001 C CNN
+F 0 "#PWR0124" H 1700 5000 50  0001 C CNN
 F 1 "+5VA" H 1700 5290 50  0000 C CNN
 F 2 "" H 1700 5150 50  0000 C CNN
 F 3 "" H 1700 5150 50  0000 C CNN
diff --git a/hw/kicad/v4.0/hv.sch b/hw/kicad/v4.0/hv.sch
index 321a2b4c..7b25d2d3 100644
--- a/hw/kicad/v4.0/hv.sch
+++ b/hw/kicad/v4.0/hv.sch
@@ -15,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L stmbl1:SI8621 U3
+L stmbl:SI8621 U3
 U 1 1 56590991
 P 4050 1950
 F 0 "U3" H 4600 1250 60  0000 C CNN
@@ -98,7 +98,7 @@ TX
 Text HLabel 3100 2100 0    60   Input ~ 0
 RX
 $Comp
-L stmbl1:GND #PWR01
+L stmbl:GND #PWR01
 U 1 1 566A2E2E
 P 3700 2800
 F 0 "#PWR01" H 3700 2550 50  0001 C CNN
@@ -109,7 +109,7 @@ F 3 "" H 3700 2800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR02
+L stmbl:GNDPWR #PWR02
 U 1 1 566A2FC8
 P 4400 2800
 F 0 "#PWR02" H 4400 2600 50  0001 C CNN
@@ -120,7 +120,7 @@ F 3 "" H 4400 2750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3V #PWR03
+L stmbl:+3.3V #PWR03
 U 1 1 566A3162
 P 3700 1050
 F 0 "#PWR03" H 3700 900 50  0001 C CNN
@@ -131,7 +131,7 @@ F 3 "" H 3700 1050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3VP #PWR04
+L stmbl:+3.3VP #PWR04
 U 1 1 566A32FC
 P 4400 1050
 F 0 "#PWR04" H 4550 1000 50  0001 C CNN
@@ -142,7 +142,7 @@ F 3 "" H 4400 1050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C19
+L stmbl:C C19
 U 1 1 566A3B64
 P 3450 1150
 F 0 "C19" H 3475 1250 50  0000 L CNN
@@ -157,7 +157,7 @@ F 7 "X7R" H 3450 1150 50  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C30
+L stmbl:C C30
 U 1 1 566A4471
 P 4650 1150
 F 0 "C30" H 4675 1250 50  0000 L CNN
@@ -172,7 +172,7 @@ F 7 "X7R" H 4650 1150 50  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR05
+L stmbl:GND #PWR05
 U 1 1 566A4897
 P 3200 1150
 F 0 "#PWR05" H 3200 900 50  0001 C CNN
@@ -183,7 +183,7 @@ F 3 "" H 3200 1150 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR06
+L stmbl:GNDPWR #PWR06
 U 1 1 566A4A42
 P 4900 1150
 F 0 "#PWR06" H 4900 950 50  0001 C CNN
@@ -210,7 +210,7 @@ TX
 Text HLabel 2550 1800 2    60   Input ~ 0
 RX
 $Comp
-L stmbl1:+3.3V #PWR07
+L stmbl:+3.3V #PWR07
 U 1 1 5784C75E
 P 2550 1550
 F 0 "#PWR07" H 2550 1400 50  0001 C CNN
@@ -221,7 +221,7 @@ F 3 "" H 2550 1550 50  0000 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR08
+L stmbl:GND #PWR08
 U 1 1 5784C766
 P 2550 1950
 F 0 "#PWR08" H 2550 1700 50  0001 C CNN
@@ -232,7 +232,7 @@ F 3 "" H 2550 1950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:CONN_01X04 P13
+L stmbl:CONN_01X04 P13
 U 1 1 57AEC939
 P 2300 1750
 F 0 "P13" H 2300 2000 50  0000 C CNN
@@ -243,7 +243,7 @@ F 3 "" H 2300 1750 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:CONN_01X02 P2
+L stmbl:CONN_01X02 P2
 U 1 1 57DC49A6
 P 10200 1700
 F 0 "P2" H 10200 1850 50  0000 C CNN
@@ -258,7 +258,7 @@ F 7 " " H 10200 1700 50  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+15V #PWR09
+L stmbl:+15V #PWR09
 U 1 1 57DCE570
 P 9900 1050
 F 0 "#PWR09" H 9900 900 50  0001 C CNN
@@ -269,7 +269,7 @@ F 3 "" H 9900 1050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R142
+L stmbl:R R142
 U 1 1 57DCE6B7
 P 9900 1400
 F 0 "R142" V 9980 1400 50  0000 C CNN
@@ -284,7 +284,7 @@ F 7 "1%" H 9900 1400 50  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C127
+L stmbl:C C127
 U 1 1 57DCE80A
 P 8800 1900
 F 0 "C127" H 8825 2000 50  0000 L CNN
@@ -299,7 +299,7 @@ F 7 "X7R" H 8800 1900 50  0001 C CNN "Tolerance"
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:R R141
+L stmbl:R R141
 U 1 1 57DD09BB
 P 9650 1650
 F 0 "R141" V 9730 1650 50  0000 C CNN
@@ -313,7 +313,7 @@ F 6 "1%" H 9650 1650 50  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R7
+L stmbl:R R7
 U 1 1 57DD2315
 P 9100 1900
 F 0 "R7" V 9180 1900 50  0000 C CNN
@@ -328,7 +328,7 @@ F 7 "1%" H 9100 1900 50  0001 C CNN "Tolerance"
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR010
+L stmbl:GNDPWR #PWR010
 U 1 1 57DD49BF
 P 9900 2250
 F 0 "#PWR010" H 9900 2050 50  0001 C CNN
@@ -503,7 +503,7 @@ Connection ~ 9100 1650
 Wire Wire Line
 	5400 1800 5400 1900
 $Comp
-L stmbl1:non_plated U24
+L stmbl:non_plated U24
 U 1 1 58275572
 P 6600 1050
 F 0 "U24" H 6600 700 60  0000 C CNN
@@ -514,7 +514,7 @@ F 3 "" H 6600 1050 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:non_plated U30
+L stmbl:non_plated U30
 U 1 1 582756C2
 P 7250 1100
 F 0 "U30" H 7250 750 60  0000 C CNN
@@ -525,7 +525,7 @@ F 3 "" H 7250 1100 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:non_plated U31
+L stmbl:non_plated U31
 U 1 1 58275820
 P 8000 1100
 F 0 "U31" H 8000 750 60  0000 C CNN
@@ -536,7 +536,7 @@ F 3 "" H 8000 1100 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C138
+L stmbl:C C138
 U 1 1 58307AEE
 P 9400 1900
 F 0 "C138" H 9425 2000 50  0000 L CNN
@@ -557,7 +557,7 @@ Wire Wire Line
 	8800 2050 8800 2150
 Connection ~ 9100 2150
 $Comp
-L stmbl1:C C40
+L stmbl:C C40
 U 1 1 5886523B
 P 10600 1900
 F 0 "C40" H 10625 2000 50  0000 L CNN
@@ -579,7 +579,7 @@ Connection ~ 9900 1150
 Wire Wire Line
 	10600 2150 10600 2050
 $Comp
-L stmbl1:R R162
+L stmbl:R R162
 U 1 1 58871945
 P 8450 2600
 F 0 "R162" V 8530 2600 50  0000 C CNN
@@ -594,7 +594,7 @@ F 7 "1%" H 8450 2600 50  0001 C CNN "Tolerance"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR011
+L stmbl:GNDPWR #PWR011
 U 1 1 58871DBC
 P 8700 2600
 F 0 "#PWR011" H 8700 2400 50  0001 C CNN
diff --git a/hw/kicad/v4.0/hv_drive.sch b/hw/kicad/v4.0/hv_drive.sch
index 383fe6eb..3809c987 100644
--- a/hw/kicad/v4.0/hv_drive.sch
+++ b/hw/kicad/v4.0/hv_drive.sch
@@ -15,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L stmbl1:CP C21
+L stmbl:CP C21
 U 1 1 56590C91
 P 3050 4400
 F 0 "C21" H 3075 4500 50  0000 L CNN
@@ -31,7 +31,7 @@ F 8 "" H 3050 4400 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:CP C22
+L stmbl:CP C22
 U 1 1 56590CD1
 P 3350 4400
 F 0 "C22" H 3375 4500 50  0000 L CNN
@@ -47,7 +47,7 @@ F 8 "" H 3350 4400 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C28
+L stmbl:C C28
 U 1 1 56590D2C
 P 4250 4400
 F 0 "C28" H 4275 4500 50  0000 L CNN
@@ -63,7 +63,7 @@ F 8 "X7R" H 4250 4400 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C34
+L stmbl:C C34
 U 1 1 56590D5B
 P 4550 4400
 F 0 "C34" H 4575 4500 50  0000 L CNN
@@ -85,7 +85,7 @@ Connection ~ 3350 4250
 Connection ~ 4250 4250
 Connection ~ 4550 4250
 $Comp
-L stmbl1:C C42
+L stmbl:C C42
 U 1 1 5659119D
 P 5600 3050
 F 0 "C42" H 5625 3150 50  0000 L CNN
@@ -144,7 +144,7 @@ en
 Text HLabel 7150 3050 2    60   Input ~ 0
 itirp
 $Comp
-L stmbl1:GNDPWR #PWR056
+L stmbl:GNDPWR #PWR056
 U 1 1 56697E7C
 P 7550 5150
 F 0 "#PWR056" H 7550 4950 50  0001 C CNN
@@ -155,7 +155,7 @@ F 3 "" H 7550 5100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+15V #PWR057
+L stmbl:+15V #PWR057
 U 1 1 56697EBC
 P 7550 4650
 F 0 "#PWR057" H 7550 4500 50  0001 C CNN
@@ -166,7 +166,7 @@ F 3 "" H 7550 4650 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:IRAM256a U12
+L stmbl:IRAM256a U12
 U 1 1 5668DD3B
 P 6450 4050
 F 0 "U12" H 6100 5200 60  0000 C CNN
@@ -182,7 +182,7 @@ F 8 "" H 6450 4050 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C43
+L stmbl:C C43
 U 1 1 5668E03D
 P 5600 3450
 F 0 "C43" H 5625 3550 50  0000 L CNN
@@ -205,7 +205,7 @@ Wire Wire Line
 	5450 3450 5450 3550
 Connection ~ 5450 3550
 $Comp
-L stmbl1:C C44
+L stmbl:C C44
 U 1 1 5668E1AC
 P 5600 3850
 F 0 "C44" H 5625 3950 50  0000 L CNN
@@ -228,7 +228,7 @@ Wire Wire Line
 	5450 3850 5450 3950
 Connection ~ 5450 3950
 $Comp
-L stmbl1:R R80
+L stmbl:R R80
 U 1 1 5668E2F9
 P 5400 4550
 F 0 "R80" V 5480 4550 50  0000 C CNN
@@ -244,7 +244,7 @@ F 8 "1%" H 5400 4550 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R81
+L stmbl:R R81
 U 1 1 5668E493
 P 5400 4750
 F 0 "R81" V 5480 4750 50  0000 C CNN
@@ -260,7 +260,7 @@ F 8 "1%" H 5400 4750 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R82
+L stmbl:R R82
 U 1 1 5668E4D6
 P 5400 4950
 F 0 "R82" V 5480 4950 50  0000 C CNN
@@ -299,7 +299,7 @@ Wire Wire Line
 	5700 5050 5700 4950
 Connection ~ 5700 4950
 $Comp
-L stmbl1:GNDPWR #PWR058
+L stmbl:GNDPWR #PWR058
 U 1 1 5668FA38
 P 2950 4650
 F 0 "#PWR058" H 2950 4450 50  0001 C CNN
@@ -325,7 +325,7 @@ Wire Wire Line
 Wire Wire Line
 	7550 5050 7550 5150
 $Comp
-L stmbl1:C C63
+L stmbl:C C63
 U 1 1 56690594
 P 7800 4900
 F 0 "C63" H 7825 5000 50  0000 L CNN
@@ -343,7 +343,7 @@ $EndComp
 Connection ~ 7550 5050
 Connection ~ 7550 4750
 $Comp
-L stmbl1:CONN_01X03 P8
+L stmbl:CONN_01X03 P8
 U 1 1 566CEA04
 P 5450 2000
 F 0 "P8" H 5450 2200 50  0000 C CNN
@@ -359,7 +359,7 @@ F 8 "" H 5450 2000 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:CONN_01X02 P6
+L stmbl:CONN_01X02 P6
 U 1 1 566CF01F
 P 3900 1950
 F 0 "P6" H 3900 2100 50  0000 C CNN
@@ -375,7 +375,7 @@ F 8 "" H 3900 1950 60  0001 C CNN "Tolerance"
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR059
+L stmbl:GNDPWR #PWR059
 U 1 1 566CF13E
 P 4200 2100
 F 0 "#PWR059" H 4200 1900 50  0001 C CNN
@@ -386,7 +386,7 @@ F 3 "" H 4200 2050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:VPP #PWR060
+L stmbl:VPP #PWR060
 U 1 1 566CF184
 P 4200 1800
 F 0 "#PWR060" H 4200 1650 50  0001 C CNN
@@ -407,7 +407,7 @@ Wire Wire Line
 Wire Wire Line
 	2950 4250 3050 4250
 $Comp
-L stmbl1:VPP #PWR061
+L stmbl:VPP #PWR061
 U 1 1 566CF322
 P 2950 4150
 F 0 "#PWR061" H 2950 4000 50  0001 C CNN
@@ -438,7 +438,7 @@ Wire Wire Line
 Wire Wire Line
 	7050 4650 7150 4650
 $Comp
-L stmbl1:+3.3VP #PWR062
+L stmbl:+3.3VP #PWR062
 U 1 1 566DE47B
 P 7800 4050
 F 0 "#PWR062" H 7950 4000 50  0001 C CNN
@@ -449,7 +449,7 @@ F 3 "" H 7800 4050 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R115
+L stmbl:R R115
 U 1 1 566DE4EC
 P 7800 4300
 F 0 "R115" V 7880 4300 50  0000 C CNN
@@ -482,7 +482,7 @@ Wire Wire Line
 	5250 4750 5150 4750
 Connection ~ 5150 4750
 $Comp
-L stmbl1:C C38
+L stmbl:C C38
 U 1 1 57779550
 P 4850 4400
 F 0 "C38" H 4875 4500 50  0000 L CNN
@@ -498,7 +498,7 @@ F 8 "X7R" H 4850 4400 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C93
+L stmbl:C C93
 U 1 1 5777A039
 P 3950 4400
 F 0 "C93" H 3975 4500 50  0000 L CNN
@@ -514,7 +514,7 @@ F 8 "X7R" H 3950 4400 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C92
+L stmbl:C C92
 U 1 1 5777A5B0
 P 3650 4400
 F 0 "C92" H 3675 4500 50  0000 L CNN
@@ -536,7 +536,7 @@ Connection ~ 3650 4250
 Connection ~ 4850 4550
 Connection ~ 4850 4250
 $Comp
-L stmbl1:C C129
+L stmbl:C C129
 U 1 1 57F703A4
 P 8100 4900
 F 0 "C129" H 8125 5000 50  0000 L CNN
@@ -554,7 +554,7 @@ $EndComp
 Connection ~ 7800 5050
 Connection ~ 7800 4750
 $Comp
-L stmbl1:C C14
+L stmbl:C C14
 U 1 1 583034AA
 P 8400 4900
 F 0 "C14" H 8425 5000 50  0000 L CNN
@@ -572,7 +572,7 @@ $EndComp
 Connection ~ 8100 5050
 Connection ~ 8100 4750
 $Comp
-L stmbl1:C C147
+L stmbl:C C147
 U 1 1 58B0F177
 P 8800 4900
 F 0 "C147" H 8825 5000 50  0000 L CNN
@@ -594,7 +594,7 @@ Wire Wire Line
 Wire Wire Line
 	8800 4650 8800 4750
 $Comp
-L stmbl1:GNDPWR #PWR063
+L stmbl:GNDPWR #PWR063
 U 1 1 58B0F3C7
 P 8800 5150
 F 0 "#PWR063" H 8800 4950 50  0001 C CNN
diff --git a/hw/kicad/v4.0/hv_sense.sch b/hw/kicad/v4.0/hv_sense.sch
index e9e763ca..fac26112 100644
--- a/hw/kicad/v4.0/hv_sense.sch
+++ b/hw/kicad/v4.0/hv_sense.sch
@@ -19,7 +19,7 @@ U
 Text HLabel 2600 4000 0    60   Input ~ 0
 U_
 $Comp
-L stmbl1:R R27
+L stmbl:R R27
 U 1 1 566960D3
 P 2900 3350
 F 0 "R27" V 2980 3350 50  0000 C CNN
@@ -35,7 +35,7 @@ F 8 "1%" H 2900 3350 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R28
+L stmbl:R R28
 U 1 1 56696104
 P 2900 3750
 F 0 "R28" V 2980 3750 50  0000 C CNN
@@ -51,7 +51,7 @@ F 8 "1%" H 2900 3750 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R29
+L stmbl:R R29
 U 1 1 56696127
 P 2900 4250
 F 0 "R29" V 2980 4250 50  0000 C CNN
@@ -67,7 +67,7 @@ F 8 "1%" H 2900 4250 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR051
+L stmbl:GNDPWR #PWR051
 U 1 1 566961CF
 P 2900 4500
 F 0 "#PWR051" H 2900 4300 50  0001 C CNN
@@ -82,7 +82,7 @@ V
 Text HLabel 3400 4000 0    60   Input ~ 0
 V_
 $Comp
-L stmbl1:R R32
+L stmbl:R R32
 U 1 1 5669628D
 P 3700 3350
 F 0 "R32" V 3780 3350 50  0000 C CNN
@@ -98,7 +98,7 @@ F 8 "1%" H 3700 3350 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R33
+L stmbl:R R33
 U 1 1 56696293
 P 3700 3750
 F 0 "R33" V 3780 3750 50  0000 C CNN
@@ -114,7 +114,7 @@ F 8 "1%" H 3700 3750 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R34
+L stmbl:R R34
 U 1 1 56696299
 P 3700 4250
 F 0 "R34" V 3780 4250 50  0000 C CNN
@@ -130,7 +130,7 @@ F 8 "1%" H 3700 4250 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR052
+L stmbl:GNDPWR #PWR052
 U 1 1 566962B2
 P 3700 4500
 F 0 "#PWR052" H 3700 4300 50  0001 C CNN
@@ -145,7 +145,7 @@ W
 Text HLabel 4200 4000 0    60   Input ~ 0
 W_
 $Comp
-L stmbl1:R R51
+L stmbl:R R51
 U 1 1 56696338
 P 4500 3350
 F 0 "R51" V 4580 3350 50  0000 C CNN
@@ -161,7 +161,7 @@ F 8 "1%" H 4500 3350 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R52
+L stmbl:R R52
 U 1 1 5669633E
 P 4500 3750
 F 0 "R52" V 4580 3750 50  0000 C CNN
@@ -177,7 +177,7 @@ F 8 "1%" H 4500 3750 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R53
+L stmbl:R R53
 U 1 1 56696344
 P 4500 4250
 F 0 "R53" V 4580 4250 50  0000 C CNN
@@ -193,7 +193,7 @@ F 8 "1%" H 4500 4250 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR053
+L stmbl:GNDPWR #PWR053
 U 1 1 5669635D
 P 4500 4500
 F 0 "#PWR053" H 4500 4300 50  0001 C CNN
@@ -206,7 +206,7 @@ $EndComp
 Text HLabel 5100 4000 0    60   Input ~ 0
 HV_
 $Comp
-L stmbl1:R R77
+L stmbl:R R77
 U 1 1 566963D7
 P 5400 3350
 F 0 "R77" V 5480 3350 50  0000 C CNN
@@ -222,7 +222,7 @@ F 8 "1%" H 5400 3350 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R78
+L stmbl:R R78
 U 1 1 566963DD
 P 5400 3750
 F 0 "R78" V 5480 3750 50  0000 C CNN
@@ -238,7 +238,7 @@ F 8 "1%" H 5400 3750 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R79
+L stmbl:R R79
 U 1 1 566963E3
 P 5400 4250
 F 0 "R79" V 5480 4250 50  0000 C CNN
@@ -254,7 +254,7 @@ F 8 "1%" H 5400 4250 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR054
+L stmbl:GNDPWR #PWR054
 U 1 1 566963FC
 P 5400 4500
 F 0 "#PWR054" H 5400 4300 50  0001 C CNN
@@ -265,7 +265,7 @@ F 3 "" H 5400 4450 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C11
+L stmbl:C C11
 U 1 1 5682FF8E
 P 2700 4250
 F 0 "C11" H 2725 4350 50  0000 L CNN
@@ -281,7 +281,7 @@ F 8 "X7R" H 2700 4250 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C20
+L stmbl:C C20
 U 1 1 5683022A
 P 3500 4250
 F 0 "C20" H 3525 4350 50  0000 L CNN
@@ -297,7 +297,7 @@ F 8 "X7R" H 3500 4250 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C23
+L stmbl:C C23
 U 1 1 568302B9
 P 4300 4250
 F 0 "C23" H 4325 4350 50  0000 L CNN
@@ -313,7 +313,7 @@ F 8 "X7R" H 4300 4250 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C39
+L stmbl:C C39
 U 1 1 56830430
 P 5200 4250
 F 0 "C39" H 5225 4350 50  0000 L CNN
@@ -329,7 +329,7 @@ F 8 "X7R" H 5200 4250 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:VPP #PWR055
+L stmbl:VPP #PWR055
 U 1 1 5775CE00
 P 5400 3100
 F 0 "#PWR055" H 5400 2950 50  0001 C CNN
diff --git a/hw/kicad/v4.0/hv_supply.sch b/hw/kicad/v4.0/hv_supply.sch
index 3a83562c..c654a779 100644
--- a/hw/kicad/v4.0/hv_supply.sch
+++ b/hw/kicad/v4.0/hv_supply.sch
@@ -15,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L stmbl1:D D10
+L stmbl:D D10
 U 1 1 56657C30
 P 6400 4250
 F 0 "D10" H 6400 4350 50  0000 C CNN
@@ -31,7 +31,7 @@ F 8 "" H 6400 4250 60  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:D D11
+L stmbl:D D11
 U 1 1 56657CAE
 P 7200 3750
 F 0 "D11" H 7200 3850 50  0000 C CNN
@@ -47,7 +47,7 @@ F 8 "" H 7200 3750 60  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:INDUCTOR L2
+L stmbl:INDUCTOR L2
 U 1 1 56657DB8
 P 6800 4000
 F 0 "L2" V 6750 4000 50  0000 C CNN
@@ -63,7 +63,7 @@ F 8 "" H 6800 4000 60  0001 C CNN "Tolerance"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:C C58
+L stmbl:C C58
 U 1 1 56657F29
 P 7200 4250
 F 0 "C58" H 7225 4350 50  0000 L CNN
@@ -79,7 +79,7 @@ F 8 "X7R" H 7200 4250 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR042
+L stmbl:GNDPWR #PWR042
 U 1 1 56659A1F
 P 8200 4650
 F 0 "#PWR042" H 8200 4450 50  0001 C CNN
@@ -90,7 +90,7 @@ F 3 "" H 8200 4600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+15V #PWR043
+L stmbl:+15V #PWR043
 U 1 1 56659B14
 P 8200 3900
 F 0 "#PWR043" H 8200 3750 50  0001 C CNN
@@ -101,7 +101,7 @@ F 3 "" H 8200 3900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:VPP #PWR044
+L stmbl:VPP #PWR044
 U 1 1 56659BEB
 P 3950 3300
 F 0 "#PWR044" H 3950 3150 50  0001 C CNN
@@ -112,7 +112,7 @@ F 3 "" H 3950 3300 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C51
+L stmbl:C C51
 U 1 1 5774AD7A
 P 6400 3750
 F 0 "C51" H 6425 3850 50  0000 L CNN
@@ -128,7 +128,7 @@ F 8 "X7R" H 6400 3750 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C41
+L stmbl:C C41
 U 1 1 5774B2A5
 P 5250 3750
 F 0 "C41" H 5275 3850 50  0000 L CNN
@@ -177,7 +177,7 @@ Wire Wire Line
 Wire Wire Line
 	5250 3500 4950 3500
 $Comp
-L stmbl1:R R91
+L stmbl:R R91
 U 1 1 5774B784
 P 5600 3750
 F 0 "R91" V 5680 3750 50  0000 C CNN
@@ -193,7 +193,7 @@ F 8 "1%" H 5600 3750 30  0001 C CNN "Tolerance"
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:R R92
+L stmbl:R R92
 U 1 1 5774BB53
 P 6550 3100
 F 0 "R92" V 6630 3100 50  0000 C CNN
@@ -219,7 +219,7 @@ Wire Wire Line
 Wire Wire Line
 	3950 3700 4250 3700
 $Comp
-L stmbl1:LED D8
+L stmbl:LED D8
 U 1 1 57752985
 P 9300 4350
 F 0 "D8" H 9300 4450 50  0000 C CNN
@@ -235,7 +235,7 @@ F 8 "" H 9300 4350 50  0001 C CNN "Tolerance"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR045
+L stmbl:GNDPWR #PWR045
 U 1 1 57752AE5
 P 9300 4650
 F 0 "#PWR045" H 9300 4450 50  0001 C CNN
@@ -246,7 +246,7 @@ F 3 "" H 9300 4600 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R75
+L stmbl:R R75
 U 1 1 57752B29
 P 9300 3900
 F 0 "R75" V 9380 3900 50  0000 C CNN
@@ -262,7 +262,7 @@ F 8 "1%" H 9300 3900 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+15V #PWR046
+L stmbl:+15V #PWR046
 U 1 1 57752BA2
 P 9300 3250
 F 0 "#PWR046" H 9300 3100 50  0001 C CNN
@@ -279,7 +279,7 @@ Wire Wire Line
 Wire Wire Line
 	9300 4550 9300 4650
 $Comp
-L stmbl1:R R21
+L stmbl:R R21
 U 1 1 57828197
 P 2700 6200
 F 0 "R21" V 2780 6200 50  0000 C CNN
@@ -295,7 +295,7 @@ F 8 "1%" H 2700 6200 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R19
+L stmbl:R R19
 U 1 1 5782819E
 P 2450 6450
 F 0 "R19" V 2530 6450 50  0000 C CNN
@@ -311,7 +311,7 @@ F 8 "1%" H 2450 6450 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:D_Schottky D6
+L stmbl:D_Schottky D6
 U 1 1 578281A5
 P 2950 6850
 F 0 "D6" H 2950 6950 50  0000 C CNN
@@ -327,7 +327,7 @@ F 8 "" H 2950 6850 60  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C15
+L stmbl:C C15
 U 1 1 578281AC
 P 2600 5900
 F 0 "C15" H 2625 6000 50  0000 L CNN
@@ -343,7 +343,7 @@ F 8 "X7R" H 2600 5900 60  0001 C CNN "Tolerance"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:INDUCTOR L4
+L stmbl:INDUCTOR L4
 U 1 1 578281B3
 P 3350 6050
 F 0 "L4" V 3300 6050 50  0000 C CNN
@@ -372,7 +372,7 @@ Connection ~ 2450 6200
 Connection ~ 2850 6050
 Connection ~ 3750 6050
 $Comp
-L stmbl1:ACT4088 U4
+L stmbl:ACT4088 U4
 U 1 1 578281C8
 P 1950 6050
 F 0 "U4" H 1800 6300 60  0000 C CNN
@@ -399,7 +399,7 @@ NoConn ~ 1550 6050
 Connection ~ 2950 6050
 Connection ~ 2950 7100
 $Comp
-L stmbl1:GNDPWR #PWR047
+L stmbl:GNDPWR #PWR047
 U 1 1 57828DB1
 P 1450 7200
 F 0 "#PWR047" H 1450 7000 50  0001 C CNN
@@ -410,7 +410,7 @@ F 3 "" H 1450 7150 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+15V #PWR048
+L stmbl:+15V #PWR048
 U 1 1 578291C8
 P 1450 5800
 F 0 "#PWR048" H 1450 5650 50  0001 C CNN
@@ -421,7 +421,7 @@ F 3 "" H 1450 5800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3VP #PWR049
+L stmbl:+3.3VP #PWR049
 U 1 1 5782990B
 P 3750 5950
 F 0 "#PWR049" H 3900 5900 50  0001 C CNN
@@ -435,7 +435,7 @@ Connection ~ 2450 7100
 Wire Wire Line
 	2950 7000 2950 7100
 $Comp
-L stmbl1:R R30
+L stmbl:R R30
 U 1 1 57B00182
 P 9300 3500
 F 0 "R30" V 9380 3500 50  0000 C CNN
@@ -471,7 +471,7 @@ Wire Wire Line
 	7950 4550 7950 4400
 Connection ~ 7950 4550
 $Comp
-L stmbl1:C C35
+L stmbl:C C35
 U 1 1 57B2A7C0
 P 3750 6450
 F 0 "C35" H 3775 6550 50  0000 L CNN
@@ -487,7 +487,7 @@ F 8 "X7R" H 3750 6450 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C60
+L stmbl:C C60
 U 1 1 57B2A8C5
 P 3250 6450
 F 0 "C60" H 3275 6550 50  0000 L CNN
@@ -503,7 +503,7 @@ F 8 "X7R" H 3250 6450 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:lnk304D U5
+L stmbl:lnk304D U5
 U 1 1 57F9295B
 P 4600 3600
 F 0 "U5" H 4500 3800 60  0000 C CNN
@@ -519,7 +519,7 @@ F 8 "" H 4600 3600 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C3
+L stmbl:C C3
 U 1 1 58068ABB
 P 3950 4400
 F 0 "C3" H 3975 4500 50  0000 L CNN
@@ -535,7 +535,7 @@ F 8 "X7R" H 3950 4400 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GNDPWR #PWR050
+L stmbl:GNDPWR #PWR050
 U 1 1 5806941B
 P 3950 4650
 F 0 "#PWR050" H 3950 4450 50  0001 C CNN
@@ -548,7 +548,7 @@ $EndComp
 Wire Wire Line
 	3950 4550 3950 4650
 $Comp
-L stmbl1:R R15
+L stmbl:R R15
 U 1 1 5812BBA8
 P 2450 6850
 F 0 "R15" V 2530 6850 50  0000 C CNN
@@ -570,7 +570,7 @@ Wire Wire Line
 Text Notes 3850 6900 0    60   ~ 0
 0.81V * (51k + 15k + 1k) / (15k + 1k) = 3.39V
 $Comp
-L stmbl1:R R16
+L stmbl:R R16
 U 1 1 5813BF7B
 P 5600 3350
 F 0 "R16" V 5680 3350 50  0000 C CNN
@@ -586,7 +586,7 @@ F 8 "1%" H 5600 3350 30  0001 C CNN "Tolerance"
 	-1   0    0    1   
 $EndComp
 $Comp
-L stmbl1:R R143
+L stmbl:R R143
 U 1 1 5813C2F5
 P 6150 3100
 F 0 "R143" V 6230 3100 50  0000 C CNN
@@ -629,7 +629,7 @@ Wire Wire Line
 	3750 6600 3750 6700
 Connection ~ 3950 3700
 $Comp
-L stmbl1:C C50
+L stmbl:C C50
 U 1 1 5824506F
 P 3500 6450
 F 0 "C50" H 3525 6550 50  0000 L CNN
@@ -649,7 +649,7 @@ Wire Wire Line
 	4000 6700 4000 6600
 Connection ~ 3750 6700
 $Comp
-L stmbl1:C C68
+L stmbl:C C68
 U 1 1 58254B38
 P 7950 4250
 F 0 "C68" H 7975 4350 50  0000 L CNN
@@ -665,7 +665,7 @@ F 8 "X7R" H 7950 4250 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C69
+L stmbl:C C69
 U 1 1 582564B2
 P 7450 4250
 F 0 "C69" H 7475 4350 50  0000 L CNN
@@ -683,7 +683,7 @@ $EndComp
 Wire Wire Line
 	4000 6200 4000 6300
 $Comp
-L stmbl1:C C4
+L stmbl:C C4
 U 1 1 5825704C
 P 4000 6450
 F 0 "C4" H 4025 6550 50  0000 L CNN
@@ -722,7 +722,7 @@ Wire Wire Line
 Wire Wire Line
 	2850 5900 2850 6050
 $Comp
-L stmbl1:R R161
+L stmbl:R R161
 U 1 1 5886A2CE
 P 8450 4250
 F 0 "R161" V 8530 4250 50  0000 C CNN
@@ -738,7 +738,7 @@ F 8 "1%" H 8450 4250 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C97
+L stmbl:C C97
 U 1 1 5886B864
 P 7700 4250
 F 0 "C97" H 7725 4350 50  0000 L CNN
@@ -842,7 +842,7 @@ Wire Wire Line
 Wire Wire Line
 	5600 3100 6000 3100
 $Comp
-L stmbl1:CP C70
+L stmbl:CP C70
 U 1 1 5AC60AA6
 P 8200 4250
 F 0 "C70" H 8225 4350 50  0000 L CNN
diff --git a/hw/kicad/v4.0/io.sch b/hw/kicad/v4.0/io.sch
index 00bf3ff5..a51c30e8 100644
--- a/hw/kicad/v4.0/io.sch
+++ b/hw/kicad/v4.0/io.sch
@@ -15,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L stmbl1:CONN_01X06 P5
+L stmbl:CONN_01X06 P5
 U 1 1 56602281
 P 3300 3900
 F 0 "P5" H 3300 4250 50  0000 C CNN
@@ -31,7 +31,7 @@ F 8 "" H 3300 3900 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:CONN_01X06 P9
+L stmbl:CONN_01X06 P9
 U 1 1 56684699
 P 10550 1300
 F 0 "P9" H 10550 1650 50  0000 C CNN
@@ -65,7 +65,7 @@ MOSI
 Text HLabel 5900 1100 0    60   Input ~ 0
 SCK
 $Comp
-L stmbl1:+24V #PWR0145
+L stmbl:+24V #PWR0145
 U 1 1 56837283
 P 10150 1050
 F 0 "#PWR0145" H 10150 900 50  0001 C CNN
@@ -76,7 +76,7 @@ F 3 "" H 10150 1050 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:+24V #PWR0146
+L stmbl:+24V #PWR0146
 U 1 1 568372BF
 P 10150 1350
 F 0 "#PWR0146" H 10150 1200 50  0001 C CNN
@@ -87,7 +87,7 @@ F 3 "" H 10150 1350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:+24V #PWR0147
+L stmbl:+24V #PWR0147
 U 1 1 5683748F
 P 6600 1600
 F 0 "#PWR0147" H 6600 1450 50  0001 C CNN
@@ -98,7 +98,7 @@ F 3 "" H 6600 1600 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:+5V #PWR0148
+L stmbl:+5V #PWR0148
 U 1 1 56837542
 P 5900 1600
 F 0 "#PWR0148" H 5900 1450 50  0001 C CNN
@@ -109,7 +109,7 @@ F 3 "" H 5900 1600 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0149
+L stmbl:GND #PWR0149
 U 1 1 56837580
 P 6600 1500
 F 0 "#PWR0149" H 6600 1250 50  0001 C CNN
@@ -120,7 +120,7 @@ F 3 "" H 6600 1500 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0150
+L stmbl:GND #PWR0150
 U 1 1 568375F1
 P 10150 1550
 F 0 "#PWR0150" H 10150 1300 50  0001 C CNN
@@ -131,7 +131,7 @@ F 3 "" H 10150 1550 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR0151
+L stmbl:GND #PWR0151
 U 1 1 5683774C
 P 10150 1250
 F 0 "#PWR0151" H 10150 1000 50  0001 C CNN
@@ -154,7 +154,7 @@ Wire Wire Line
 Wire Wire Line
 	10150 1550 10350 1550
 $Comp
-L stmbl1:MMBF170 Q1
+L stmbl:MMBF170 Q1
 U 1 1 5700EA19
 P 2000 1850
 F 0 "Q1" H 2194 1942 50  0000 L CNN
@@ -170,7 +170,7 @@ F 8 "" H 2000 1850 50  0001 L CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R9
+L stmbl:R R9
 U 1 1 5700ECBA
 P 1450 1900
 F 0 "R9" V 1350 1900 50  0000 C CNN
@@ -186,7 +186,7 @@ F 8 "1%" H 1450 1900 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R12
+L stmbl:R R12
 U 1 1 5700F279
 P 1700 2150
 F 0 "R12" V 1800 2050 50  0000 L CNN
@@ -213,7 +213,7 @@ Wire Wire Line
 Wire Wire Line
 	2100 2050 2100 2400
 $Comp
-L stmbl1:GND #PWR0152
+L stmbl:GND #PWR0152
 U 1 1 5700F888
 P 2100 2500
 F 0 "#PWR0152" H 2100 2250 50  0001 C CNN
@@ -225,7 +225,7 @@ F 3 "" H 2100 2500 50  0000 C CNN
 $EndComp
 Connection ~ 2100 2400
 $Comp
-L stmbl1:D D2
+L stmbl:D D2
 U 1 1 5700FF9B
 P 2100 1300
 F 0 "D2" H 2100 1400 50  0000 C CNN
@@ -247,7 +247,7 @@ Wire Wire Line
 Wire Wire Line
 	1300 1900 1200 1900
 $Comp
-L stmbl1:MMBF170 Q2
+L stmbl:MMBF170 Q2
 U 1 1 57011943
 P 2000 3850
 F 0 "Q2" H 2194 3942 50  0000 L CNN
@@ -263,7 +263,7 @@ F 8 "" H 2000 3850 50  0001 L CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R10
+L stmbl:R R10
 U 1 1 5701194A
 P 1450 3900
 F 0 "R10" V 1350 3900 50  0000 C CNN
@@ -279,7 +279,7 @@ F 8 "1%" H 1450 3900 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R13
+L stmbl:R R13
 U 1 1 57011951
 P 1700 4150
 F 0 "R13" V 1800 4050 50  0000 L CNN
@@ -306,7 +306,7 @@ Wire Wire Line
 Wire Wire Line
 	2100 4050 2100 4400
 $Comp
-L stmbl1:GND #PWR0153
+L stmbl:GND #PWR0153
 U 1 1 5701195E
 P 2100 4500
 F 0 "#PWR0153" H 2100 4250 50  0001 C CNN
@@ -318,7 +318,7 @@ F 3 "" H 2100 4500 50  0000 C CNN
 $EndComp
 Connection ~ 2100 4400
 $Comp
-L stmbl1:D D3
+L stmbl:D D3
 U 1 1 57011965
 P 2100 3300
 F 0 "D3" H 2100 3400 50  0000 C CNN
@@ -340,7 +340,7 @@ Wire Wire Line
 Wire Wire Line
 	1300 3900 1200 3900
 $Comp
-L stmbl1:MMBF170 Q3
+L stmbl:MMBF170 Q3
 U 1 1 570122C9
 P 2000 5850
 F 0 "Q3" H 2194 5942 50  0000 L CNN
@@ -356,7 +356,7 @@ F 8 "" H 2000 5850 50  0001 L CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R11
+L stmbl:R R11
 U 1 1 570122D0
 P 1450 5900
 F 0 "R11" V 1350 5900 50  0000 C CNN
@@ -372,7 +372,7 @@ F 8 "1%" H 1450 5900 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R14
+L stmbl:R R14
 U 1 1 570122D7
 P 1700 6150
 F 0 "R14" V 1800 6050 50  0000 L CNN
@@ -399,7 +399,7 @@ Wire Wire Line
 Wire Wire Line
 	2100 6050 2100 6400
 $Comp
-L stmbl1:GND #PWR0154
+L stmbl:GND #PWR0154
 U 1 1 570122E4
 P 2100 6500
 F 0 "#PWR0154" H 2100 6250 50  0001 C CNN
@@ -411,7 +411,7 @@ F 3 "" H 2100 6500 50  0000 C CNN
 $EndComp
 Connection ~ 2100 6400
 $Comp
-L stmbl1:D D5
+L stmbl:D D5
 U 1 1 570122EB
 P 2100 5300
 F 0 "D5" H 2100 5400 50  0000 C CNN
@@ -475,7 +475,7 @@ Wire Wire Line
 	2900 5050 2450 5050
 Connection ~ 2100 5050
 $Comp
-L stmbl1:MMBF170 Q4
+L stmbl:MMBF170 Q4
 U 1 1 57014D91
 P 4700 3850
 F 0 "Q4" H 4894 3942 50  0000 L CNN
@@ -491,7 +491,7 @@ F 8 "" H 4700 3850 50  0001 L CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R40
+L stmbl:R R40
 U 1 1 57014D98
 P 4150 3900
 F 0 "R40" V 4050 3900 50  0000 C CNN
@@ -507,7 +507,7 @@ F 8 "1%" H 4150 3900 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R45
+L stmbl:R R45
 U 1 1 57014D9F
 P 4400 4150
 F 0 "R45" V 4500 4050 50  0000 L CNN
@@ -534,7 +534,7 @@ Wire Wire Line
 Wire Wire Line
 	4800 4050 4800 4400
 $Comp
-L stmbl1:GND #PWR0155
+L stmbl:GND #PWR0155
 U 1 1 57014DAC
 P 4800 4500
 F 0 "#PWR0155" H 4800 4250 50  0001 C CNN
@@ -546,7 +546,7 @@ F 3 "" H 4800 4500 50  0000 C CNN
 $EndComp
 Connection ~ 4800 4400
 $Comp
-L stmbl1:D D7
+L stmbl:D D7
 U 1 1 57014DB3
 P 4800 3300
 F 0 "D7" H 4800 3400 50  0000 C CNN
@@ -580,7 +580,7 @@ Wire Wire Line
 	5100 3550 4800 3550
 Connection ~ 4800 3550
 $Comp
-L stmbl1:R R119
+L stmbl:R R119
 U 1 1 5777EC79
 P 10050 2350
 F 0 "R119" V 10130 2350 50  0000 C CNN
@@ -596,7 +596,7 @@ F 8 "1%" H 10050 2350 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R106
+L stmbl:R R106
 U 1 1 5777EC80
 P 9850 2350
 F 0 "R106" V 9930 2350 50  0000 C CNN
@@ -612,7 +612,7 @@ F 8 "1%" H 9850 2350 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R108
+L stmbl:R R108
 U 1 1 5777EC87
 P 9850 2850
 F 0 "R108" V 9930 2850 50  0000 C CNN
@@ -628,7 +628,7 @@ F 8 "1%" H 9850 2850 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0156
+L stmbl:GND #PWR0156
 U 1 1 5777EC8E
 P 9850 3200
 F 0 "#PWR0156" H 9850 2950 50  0001 C CNN
@@ -639,7 +639,7 @@ F 3 "" H 9850 3200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3V #PWR0157
+L stmbl:+3.3V #PWR0157
 U 1 1 5777EC94
 P 10050 2100
 F 0 "#PWR0157" H 10050 1950 50  0001 C CNN
@@ -650,7 +650,7 @@ F 3 "" H 10050 2100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R105
+L stmbl:R R105
 U 1 1 5777EC9C
 P 9250 2350
 F 0 "R105" V 9330 2350 50  0000 C CNN
@@ -666,7 +666,7 @@ F 8 "1%" H 9250 2350 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R98
+L stmbl:R R98
 U 1 1 5777ECA3
 P 9050 2350
 F 0 "R98" V 9130 2350 50  0000 C CNN
@@ -682,7 +682,7 @@ F 8 "1%" H 9050 2350 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R99
+L stmbl:R R99
 U 1 1 5777ECAA
 P 9050 2850
 F 0 "R99" V 9130 2850 50  0000 C CNN
@@ -698,7 +698,7 @@ F 8 "1%" H 9050 2850 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0158
+L stmbl:GND #PWR0158
 U 1 1 5777ECB1
 P 9050 3200
 F 0 "#PWR0158" H 9050 2950 50  0001 C CNN
@@ -709,7 +709,7 @@ F 3 "" H 9050 3200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3V #PWR0159
+L stmbl:+3.3V #PWR0159
 U 1 1 5777ECB7
 P 9250 2100
 F 0 "#PWR0159" H 9250 1950 50  0001 C CNN
@@ -720,7 +720,7 @@ F 3 "" H 9250 2100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C52
+L stmbl:C C52
 U 1 1 5777ECBE
 P 9250 2850
 F 0 "C52" H 9275 2950 50  0000 L CNN
@@ -736,7 +736,7 @@ F 8 "X7R" H 9250 2850 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C59
+L stmbl:C C59
 U 1 1 5777ECC5
 P 10050 2850
 F 0 "C59" H 10075 2950 50  0000 L CNN
@@ -790,7 +790,7 @@ Connection ~ 9050 3100
 Wire Wire Line
 	8950 2600 9050 2600
 $Comp
-L stmbl1:+12V #PWR0160
+L stmbl:+12V #PWR0160
 U 1 1 57AF9557
 P 4450 2750
 F 0 "#PWR0160" H 4450 2600 50  0001 C CNN
@@ -821,7 +821,7 @@ Wire Wire Line
 Wire Wire Line
 	4450 2850 4450 2750
 $Comp
-L stmbl1:CONN_02X06 P10
+L stmbl:CONN_02X06 P10
 U 1 1 5801B855
 P 6250 1350
 F 0 "P10" H 6250 1700 50  0000 C CNN
@@ -837,7 +837,7 @@ F 8 "" H 6250 150 50  0001 C CNN "Tolerance"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R20
+L stmbl:R R20
 U 1 1 5802325E
 P 2450 1400
 F 0 "R20" V 2550 1300 50  0000 L CNN
@@ -853,7 +853,7 @@ F 8 "1%" H 2450 1400 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:Led_Small D4
+L stmbl:Led_Small D4
 U 1 1 58023549
 P 2450 1150
 F 0 "D4" H 2400 1275 50  0000 L CNN
@@ -871,7 +871,7 @@ $EndComp
 Connection ~ 2450 1550
 Connection ~ 2450 1050
 $Comp
-L stmbl1:R R22
+L stmbl:R R22
 U 1 1 5802C477
 P 2450 3400
 F 0 "R22" V 2550 3300 50  0000 L CNN
@@ -887,7 +887,7 @@ F 8 "1%" H 2450 3400 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:Led_Small D14
+L stmbl:Led_Small D14
 U 1 1 5802C47E
 P 2450 3150
 F 0 "D14" H 2400 3275 50  0000 L CNN
@@ -905,7 +905,7 @@ $EndComp
 Connection ~ 2450 3550
 Connection ~ 2450 3050
 $Comp
-L stmbl1:R R74
+L stmbl:R R74
 U 1 1 5802D7FB
 P 2450 5400
 F 0 "R74" V 2550 5300 50  0000 L CNN
@@ -921,7 +921,7 @@ F 8 "1%" H 2450 5400 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:Led_Small D15
+L stmbl:Led_Small D15
 U 1 1 5802D802
 P 2450 5150
 F 0 "D15" H 2400 5275 50  0000 L CNN
@@ -939,7 +939,7 @@ $EndComp
 Connection ~ 2450 5550
 Connection ~ 2450 5050
 $Comp
-L stmbl1:R R134
+L stmbl:R R134
 U 1 1 5803293F
 P 8350 2950
 F 0 "R134" V 8450 2850 50  0000 L CNN
@@ -955,7 +955,7 @@ F 8 "1%" H 8350 2950 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:Led_Small D20
+L stmbl:Led_Small D20
 U 1 1 58032946
 P 8350 2600
 F 0 "D20" H 8300 2725 50  0000 L CNN
@@ -973,7 +973,7 @@ $EndComp
 Wire Wire Line
 	8350 2700 8350 2800
 $Comp
-L stmbl1:GND #PWR0161
+L stmbl:GND #PWR0161
 U 1 1 5803444A
 P 8350 3200
 F 0 "#PWR0161" H 8350 2950 50  0001 C CNN
@@ -984,7 +984,7 @@ F 3 "" H 8350 3200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R120
+L stmbl:R R120
 U 1 1 580345B1
 P 7950 2950
 F 0 "R120" V 8050 2850 50  0000 L CNN
@@ -1000,7 +1000,7 @@ F 8 "1%" H 7950 2950 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:Led_Small D19
+L stmbl:Led_Small D19
 U 1 1 580345B7
 P 7950 2600
 F 0 "D19" H 7900 2725 50  0000 L CNN
@@ -1018,7 +1018,7 @@ $EndComp
 Wire Wire Line
 	7950 2700 7950 2800
 $Comp
-L stmbl1:GND #PWR0162
+L stmbl:GND #PWR0162
 U 1 1 580345BE
 P 7950 3200
 F 0 "#PWR0162" H 7950 2950 50  0001 C CNN
@@ -1041,7 +1041,7 @@ Wire Wire Line
 Wire Wire Line
 	8350 3100 8350 3200
 $Comp
-L stmbl1:GND #PWR0163
+L stmbl:GND #PWR0163
 U 1 1 580369E0
 P 5900 1400
 F 0 "#PWR0163" H 5900 1150 50  0001 C CNN
@@ -1076,7 +1076,7 @@ Wire Wire Line
 Wire Wire Line
 	6500 1100 6600 1100
 $Comp
-L stmbl1:R R85
+L stmbl:R R85
 U 1 1 58042541
 P 7550 2950
 F 0 "R85" V 7650 2850 50  0000 L CNN
@@ -1092,7 +1092,7 @@ F 8 "1%" H 7550 2950 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:Led_Small D18
+L stmbl:Led_Small D18
 U 1 1 58042548
 P 7550 2600
 F 0 "D18" H 7500 2725 50  0000 L CNN
@@ -1110,7 +1110,7 @@ $EndComp
 Wire Wire Line
 	7550 2700 7550 2800
 $Comp
-L stmbl1:GND #PWR0164
+L stmbl:GND #PWR0164
 U 1 1 58042550
 P 7550 3200
 F 0 "#PWR0164" H 7550 2950 50  0001 C CNN
@@ -1127,7 +1127,7 @@ Wire Wire Line
 Wire Wire Line
 	7550 3100 7550 3200
 $Comp
-L stmbl1:R R83
+L stmbl:R R83
 U 1 1 58042BA6
 P 7150 2950
 F 0 "R83" V 7250 2850 50  0000 L CNN
@@ -1143,7 +1143,7 @@ F 8 "1%" H 7150 2950 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:Led_Small D17
+L stmbl:Led_Small D17
 U 1 1 58042BAD
 P 7150 2600
 F 0 "D17" H 7100 2725 50  0000 L CNN
@@ -1161,7 +1161,7 @@ $EndComp
 Wire Wire Line
 	7150 2700 7150 2800
 $Comp
-L stmbl1:GND #PWR0165
+L stmbl:GND #PWR0165
 U 1 1 58042BB5
 P 7150 3200
 F 0 "#PWR0165" H 7150 2950 50  0001 C CNN
@@ -1178,7 +1178,7 @@ Wire Wire Line
 Wire Wire Line
 	7150 3100 7150 3200
 $Comp
-L stmbl1:R R76
+L stmbl:R R76
 U 1 1 58044D37
 P 6700 2950
 F 0 "R76" V 6800 2850 50  0000 L CNN
@@ -1194,7 +1194,7 @@ F 8 "1%" H 6700 2950 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:Led_Small D16
+L stmbl:Led_Small D16
 U 1 1 58044D3E
 P 6700 2600
 F 0 "D16" H 6650 2725 50  0000 L CNN
@@ -1212,7 +1212,7 @@ $EndComp
 Wire Wire Line
 	6700 2700 6700 2800
 $Comp
-L stmbl1:GND #PWR0166
+L stmbl:GND #PWR0166
 U 1 1 58044D46
 P 6700 3200
 F 0 "#PWR0166" H 6700 2950 50  0001 C CNN
@@ -1229,7 +1229,7 @@ Wire Wire Line
 Wire Wire Line
 	6700 3100 6700 3200
 $Comp
-L stmbl1:CONN_01X02 P4
+L stmbl:CONN_01X02 P4
 U 1 1 5819E5C6
 P 5400 3250
 F 0 "P4" H 5400 3400 50  0000 C CNN
@@ -1245,7 +1245,7 @@ F 8 "" H 5400 3250 50  0001 C CNN "Tolerance"
 	1    0    0    1   
 $EndComp
 $Comp
-L stmbl1:C C91
+L stmbl:C C91
 U 1 1 581C11FC
 P 1700 1300
 F 0 "C91" H 1725 1400 50  0000 L CNN
@@ -1261,7 +1261,7 @@ F 8 "X7R" H 1700 1300 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0167
+L stmbl:GND #PWR0167
 U 1 1 581C1AF6
 P 1700 1550
 F 0 "#PWR0167" H 1700 1300 50  0001 C CNN
@@ -1276,7 +1276,7 @@ Wire Wire Line
 Wire Wire Line
 	1700 1050 1700 1150
 $Comp
-L stmbl1:C C94
+L stmbl:C C94
 U 1 1 581C2D8E
 P 1700 3300
 F 0 "C94" H 1725 3400 50  0000 L CNN
@@ -1292,7 +1292,7 @@ F 8 "X7R" H 1700 3300 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0168
+L stmbl:GND #PWR0168
 U 1 1 581C2D94
 P 1700 3550
 F 0 "#PWR0168" H 1700 3300 50  0001 C CNN
@@ -1307,7 +1307,7 @@ Wire Wire Line
 Wire Wire Line
 	1700 3150 1700 3050
 $Comp
-L stmbl1:C C95
+L stmbl:C C95
 U 1 1 581C4843
 P 1700 5300
 F 0 "C95" H 1725 5400 50  0000 L CNN
@@ -1323,7 +1323,7 @@ F 8 "X7R" H 1700 5300 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR0169
+L stmbl:GND #PWR0169
 U 1 1 581C4849
 P 1700 5550
 F 0 "#PWR0169" H 1700 5300 50  0001 C CNN
@@ -1338,7 +1338,7 @@ Wire Wire Line
 Wire Wire Line
 	1700 5050 1700 5150
 $Comp
-L stmbl1:C C100
+L stmbl:C C100
 U 1 1 581C6D7F
 P 10800 1550
 F 0 "C100" H 10825 1650 50  0000 L CNN
@@ -1357,7 +1357,7 @@ Wire Wire Line
 	10800 1350 10800 1400
 Connection ~ 10350 1350
 $Comp
-L stmbl1:C C130
+L stmbl:C C130
 U 1 1 581C6F9A
 P 11100 1550
 F 0 "C130" H 11125 1650 50  0000 L CNN
@@ -1376,7 +1376,7 @@ Wire Wire Line
 	11100 1050 11100 1400
 Connection ~ 10350 1050
 $Comp
-L stmbl1:GND #PWR0170
+L stmbl:GND #PWR0170
 U 1 1 581C71AA
 P 10800 1800
 F 0 "#PWR0170" H 10800 1550 50  0001 C CNN
@@ -1389,7 +1389,7 @@ $EndComp
 Wire Wire Line
 	10800 1800 10800 1700
 $Comp
-L stmbl1:GND #PWR0171
+L stmbl:GND #PWR0171
 U 1 1 581C73A8
 P 11100 1800
 F 0 "#PWR0171" H 11100 1550 50  0001 C CNN
@@ -1402,7 +1402,7 @@ $EndComp
 Wire Wire Line
 	11100 1800 11100 1700
 $Comp
-L stmbl1:C C98
+L stmbl:C C98
 U 1 1 581CA574
 P 4400 3300
 F 0 "C98" H 4425 3400 50  0000 L CNN
@@ -1420,7 +1420,7 @@ $EndComp
 Wire Wire Line
 	4400 3050 4400 3150
 $Comp
-L stmbl1:GND #PWR0172
+L stmbl:GND #PWR0172
 U 1 1 581CA700
 P 4400 3550
 F 0 "#PWR0172" H 4400 3300 50  0001 C CNN
@@ -1433,7 +1433,7 @@ $EndComp
 Wire Wire Line
 	4400 3450 4400 3550
 $Comp
-L stmbl1:+24V #PWR0173
+L stmbl:+24V #PWR0173
 U 1 1 5830F49A
 P 5150 2750
 F 0 "#PWR0173" H 5150 2600 50  0001 C CNN
@@ -1444,7 +1444,7 @@ F 3 "" H 5150 2750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:JUMPER3_NC JP3
+L stmbl:JUMPER3_NC JP3
 U 1 1 58336753
 P 4800 2850
 F 0 "JP3" H 4850 2750 50  0000 L CNN
@@ -1460,7 +1460,7 @@ F 8 "" H 4800 2850 50  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+24V #PWR0174
+L stmbl:+24V #PWR0174
 U 1 1 584F7EFF
 P 2100 950
 F 0 "#PWR0174" H 2100 800 50  0001 C CNN
@@ -1471,7 +1471,7 @@ F 3 "" H 2100 950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+24V #PWR0175
+L stmbl:+24V #PWR0175
 U 1 1 584F7FA3
 P 2100 2950
 F 0 "#PWR0175" H 2100 2800 50  0001 C CNN
@@ -1482,7 +1482,7 @@ F 3 "" H 2100 2950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+24V #PWR0176
+L stmbl:+24V #PWR0176
 U 1 1 584F83DD
 P 2100 4950
 F 0 "#PWR0176" H 2100 4800 50  0001 C CNN
diff --git a/hw/kicad/v4.0/stmbl_4.0-cache.lib b/hw/kicad/v4.0/stmbl_4.0-cache.lib
index 43429d92..30519dd4 100644
--- a/hw/kicad/v4.0/stmbl_4.0-cache.lib
+++ b/hw/kicad/v4.0/stmbl_4.0-cache.lib
@@ -1,11 +1,11 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# stmbl1:+12V
+# stmbl:+12V
 #
-DEF stmbl1:+12V #PWR 0 0 Y Y 1 F P
+DEF stmbl:+12V #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "stmbl1:+12V" 0 140 50 H V C CNN
+F1 "stmbl:+12V" 0 140 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -16,11 +16,11 @@ X +12V 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# stmbl1:+15V
+# stmbl:+15V
 #
-DEF stmbl1:+15V #PWR 0 0 Y Y 1 F P
+DEF stmbl:+15V #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "stmbl1:+15V" 0 140 50 H V C CNN
+F1 "stmbl:+15V" 0 140 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -31,11 +31,11 @@ X +15V 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# stmbl1:+24V
+# stmbl:+24V
 #
-DEF stmbl1:+24V #PWR 0 0 Y Y 1 F P
+DEF stmbl:+24V #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "stmbl1:+24V" 0 140 50 H V C CNN
+F1 "stmbl:+24V" 0 140 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -46,11 +46,11 @@ X +24V 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# stmbl1:+3.3V
+# stmbl:+3.3V
 #
-DEF stmbl1:+3.3V #PWR 0 0 Y Y 1 F P
+DEF stmbl:+3.3V #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "stmbl1:+3.3V" 0 140 50 H V C CNN
+F1 "stmbl:+3.3V" 0 140 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 ALIAS +3.3V
@@ -62,11 +62,11 @@ X +3V3 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# stmbl1:+3.3VP
+# stmbl:+3.3VP
 #
-DEF stmbl1:+3.3VP #PWR 0 0 Y Y 1 F P
+DEF stmbl:+3.3VP #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 150 -50 50 H I C CNN
-F1 "stmbl1:+3.3VP" 0 100 50 H V C CNN
+F1 "stmbl:+3.3VP" 0 100 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -76,11 +76,11 @@ X +3.3VP 1 0 0 0 U 50 50 0 0 W N
 ENDDRAW
 ENDDEF
 #
-# stmbl1:+5F
+# stmbl:+5F
 #
-DEF stmbl1:+5F #PWR 0 0 Y Y 1 F P
+DEF stmbl:+5F #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "stmbl1:+5F" 0 140 50 H V C CNN
+F1 "stmbl:+5F" 0 140 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -91,11 +91,11 @@ X +5F 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# stmbl1:+5V
+# stmbl:+5V
 #
-DEF stmbl1:+5V #PWR 0 0 Y Y 1 F P
+DEF stmbl:+5V #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "stmbl1:+5V" 0 140 50 H V C CNN
+F1 "stmbl:+5V" 0 140 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -106,11 +106,11 @@ X +5V 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# stmbl1:+5VA
+# stmbl:+5VA
 #
-DEF stmbl1:+5VA #PWR 0 0 Y Y 1 F P
+DEF stmbl:+5VA #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "stmbl1:+5VA" 0 140 50 H V C CNN
+F1 "stmbl:+5VA" 0 140 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -121,11 +121,11 @@ X +5VA 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# stmbl1:ACT4088
+# stmbl:ACT4088
 #
-DEF stmbl1:ACT4088 U 0 40 Y Y 1 F N
+DEF stmbl:ACT4088 U 0 40 Y Y 1 F N
 F0 "U" -150 250 60 H V C CNN
-F1 "stmbl1:ACT4088" 0 -250 60 H V C CNN
+F1 "stmbl:ACT4088" 0 -250 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -139,11 +139,11 @@ X BST 6 400 150 200 L 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# stmbl1:C
+# stmbl:C
 #
-DEF stmbl1:C C 0 10 N Y 1 F N
+DEF stmbl:C C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
-F1 "stmbl1:C" 25 -100 50 H V L CNN
+F1 "stmbl:C" 25 -100 50 H V L CNN
 F2 "" 38 -150 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
@@ -161,11 +161,11 @@ X ~ 2 0 -150 110 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:CONN_01X02
+# stmbl:CONN_01X02
 #
-DEF stmbl1:CONN_01X02 P 0 40 Y N 1 F N
+DEF stmbl:CONN_01X02 P 0 40 Y N 1 F N
 F0 "P" 0 150 50 H V C CNN
-F1 "stmbl1:CONN_01X02" 100 0 50 V V C CNN
+F1 "stmbl:CONN_01X02" 100 0 50 V V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
@@ -183,11 +183,11 @@ X P2 2 -200 -50 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:CONN_01X03
+# stmbl:CONN_01X03
 #
-DEF stmbl1:CONN_01X03 P 0 40 Y N 1 F N
+DEF stmbl:CONN_01X03 P 0 40 Y N 1 F N
 F0 "P" 0 200 50 H V C CNN
-F1 "stmbl1:CONN_01X03" 100 0 50 V V C CNN
+F1 "stmbl:CONN_01X03" 100 0 50 V V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
@@ -207,11 +207,11 @@ X P3 3 -200 -100 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:CONN_01X04
+# stmbl:CONN_01X04
 #
-DEF stmbl1:CONN_01X04 P 0 40 Y N 1 F N
+DEF stmbl:CONN_01X04 P 0 40 Y N 1 F N
 F0 "P" 0 250 50 H V C CNN
-F1 "stmbl1:CONN_01X04" 100 0 50 V V C CNN
+F1 "stmbl:CONN_01X04" 100 0 50 V V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
@@ -233,11 +233,11 @@ X P4 4 -200 -150 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:CONN_01X06
+# stmbl:CONN_01X06
 #
-DEF stmbl1:CONN_01X06 P 0 40 Y N 1 F N
+DEF stmbl:CONN_01X06 P 0 40 Y N 1 F N
 F0 "P" 0 350 50 H V C CNN
-F1 "stmbl1:CONN_01X06" 100 0 50 V V C CNN
+F1 "stmbl:CONN_01X06" 100 0 50 V V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
@@ -263,11 +263,11 @@ X P6 6 -200 -250 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:CONN_02X06
+# stmbl:CONN_02X06
 #
-DEF stmbl1:CONN_02X06 P 0 1 Y N 1 F N
+DEF stmbl:CONN_02X06 P 0 1 Y N 1 F N
 F0 "P" 0 350 50 H V C CNN
-F1 "stmbl1:CONN_02X06" 0 -350 50 H V C CNN
+F1 "stmbl:CONN_02X06" 0 -350 50 H V C CNN
 F2 "" 0 -1200 50 H V C CNN
 F3 "" 0 -1200 50 H V C CNN
 $FPLIST
@@ -305,11 +305,11 @@ X P9 9 -250 -150 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:CP
+# stmbl:CP
 #
-DEF stmbl1:CP C 0 10 N Y 1 F N
+DEF stmbl:CP C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
-F1 "stmbl1:CP" 25 -100 50 H V L CNN
+F1 "stmbl:CP" 25 -100 50 H V L CNN
 F2 "" 38 -150 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
@@ -333,11 +333,11 @@ X ~ 2 0 -150 110 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:Crystal
+# stmbl:Crystal
 #
-DEF stmbl1:Crystal Y 0 40 N N 1 F N
+DEF stmbl:Crystal Y 0 40 N N 1 F N
 F0 "Y" 0 150 50 H V C CNN
-F1 "stmbl1:Crystal" 0 -150 50 H V C CNN
+F1 "stmbl:Crystal" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
@@ -352,11 +352,11 @@ X 2 2 150 0 50 L 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:D
+# stmbl:D
 #
-DEF stmbl1:D D 0 40 N N 1 F N
+DEF stmbl:D D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "stmbl1:D" 0 -100 50 H V C CNN
+F1 "stmbl:D" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
@@ -374,11 +374,11 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:D_Schottky
+# stmbl:D_Schottky
 #
-DEF stmbl1:D_Schottky D 0 40 N N 1 F N
+DEF stmbl:D_Schottky D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "stmbl1:D_Schottky" 0 -100 50 H V C CNN
+F1 "stmbl:D_Schottky" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
@@ -396,11 +396,11 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:GND
+# stmbl:GND
 #
-DEF stmbl1:GND #PWR 0 0 Y Y 1 F P
+DEF stmbl:GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -250 50 H I C CNN
-F1 "stmbl1:GND" 0 -150 50 H V C CNN
+F1 "stmbl:GND" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -409,11 +409,11 @@ X GND 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# stmbl1:GNDD
+# stmbl:GNDD
 #
-DEF stmbl1:GNDD #PWR 0 0 Y Y 1 F P
+DEF stmbl:GNDD #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -250 50 H I C CNN
-F1 "stmbl1:GNDD" 0 -150 50 H V C CNN
+F1 "stmbl:GNDD" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -422,11 +422,11 @@ X GNDD 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# stmbl1:GNDPWR
+# stmbl:GNDPWR
 #
-DEF stmbl1:GNDPWR #PWR 0 0 Y Y 1 F P
+DEF stmbl:GNDPWR #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -200 50 H I C CNN
-F1 "stmbl1:GNDPWR" 0 -130 50 H V C CNN
+F1 "stmbl:GNDPWR" 0 -130 50 H V C CNN
 F2 "" 0 -50 50 H V C CNN
 F3 "" 0 -50 50 H V C CNN
 DRAW
@@ -441,11 +441,11 @@ X GNDPWR 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# stmbl1:INDUCTOR
+# stmbl:INDUCTOR
 #
-DEF stmbl1:INDUCTOR L 0 40 N N 1 F N
+DEF stmbl:INDUCTOR L 0 40 N N 1 F N
 F0 "L" -50 0 50 V V C CNN
-F1 "stmbl1:INDUCTOR" 100 0 50 V V C CNN
+F1 "stmbl:INDUCTOR" 100 0 50 V V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -458,11 +458,11 @@ X 2 2 0 -300 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:IRAM256a
+# stmbl:IRAM256a
 #
-DEF stmbl1:IRAM256a U 0 40 Y Y 1 F N
+DEF stmbl:IRAM256a U 0 40 Y Y 1 F N
 F0 "U" -350 1150 60 H V C CNN
-F1 "stmbl1:IRAM256a" 200 -1150 60 H V C CNN
+F1 "stmbl:IRAM256a" 200 -1150 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -491,11 +491,11 @@ X UB 9 -600 200 200 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# stmbl1:JUMPER3_NC
+# stmbl:JUMPER3_NC
 #
-DEF stmbl1:JUMPER3_NC JP 0 30 Y N 1 F N
+DEF stmbl:JUMPER3_NC JP 0 30 Y N 1 F N
 F0 "JP" 50 -100 50 H V L CNN
-F1 "stmbl1:JUMPER3_NC" 0 100 50 H V C BNN
+F1 "stmbl:JUMPER3_NC" 0 100 50 H V C BNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -509,11 +509,11 @@ X 3 3 250 0 95 L 40 40 0 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:Jumper_NO_Small
+# stmbl:Jumper_NO_Small
 #
-DEF ~stmbl1:Jumper_NO_Small JP 0 30 N N 1 F N
+DEF ~stmbl:Jumper_NO_Small JP 0 30 N N 1 F N
 F0 "JP" 0 80 50 H V C CNN
-F1 "stmbl1:Jumper_NO_Small" 10 -60 50 H I C CNN
+F1 "stmbl:Jumper_NO_Small" 10 -60 50 H I C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -524,11 +524,11 @@ X 2 2 100 0 40 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:LED
+# stmbl:LED
 #
-DEF stmbl1:LED D 0 40 Y N 1 F N
+DEF stmbl:LED D 0 40 Y N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "stmbl1:LED" 0 -100 50 H V C CNN
+F1 "stmbl:LED" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
@@ -550,11 +550,11 @@ X A 2 200 0 150 L 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:LM358
+# stmbl:LM358
 #
-DEF stmbl1:LM358 U 0 20 Y Y 2 F N
+DEF stmbl:LM358 U 0 20 Y Y 2 F N
 F0 "U" -50 200 50 H V L CNN
-F1 "stmbl1:LM358" -50 -250 50 H V L CNN
+F1 "stmbl:LM358" -50 -250 50 H V L CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 ALIAS LMC6062 LMC6082 LM358N TL072 TL082
@@ -571,11 +571,11 @@ X ~ 7 300 0 100 L 50 50 2 1 O
 ENDDRAW
 ENDDEF
 #
-# stmbl1:Led_Small
+# stmbl:Led_Small
 #
-DEF stmbl1:Led_Small D 0 10 N N 1 F N
+DEF stmbl:Led_Small D 0 10 N N 1 F N
 F0 "D" -50 125 50 H V L CNN
-F1 "stmbl1:Led_Small" -175 -100 50 H V L CNN
+F1 "stmbl:Led_Small" -175 -100 50 H V L CNN
 F2 "" 0 0 50 V V C CNN
 F3 "" 0 0 50 V V C CNN
 $FPLIST
@@ -592,11 +592,11 @@ X A 2 100 0 70 L 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:MMBF170
+# stmbl:MMBF170
 #
-DEF stmbl1:MMBF170 Q 0 0 Y Y 1 F N
+DEF stmbl:MMBF170 Q 0 0 Y Y 1 F N
 F0 "Q" 200 75 50 H V L CNN
-F1 "stmbl1:MMBF170" 200 0 50 H V L CNN
+F1 "stmbl:MMBF170" 200 0 50 H V L CNN
 F2 "SOT-23" 200 -75 50 H V L CIN
 F3 "" 0 0 50 H V L CNN
 $FPLIST
@@ -625,11 +625,11 @@ X D 3 100 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:OPEN_HARDWARE_1
+# stmbl:OPEN_HARDWARE_1
 #
-DEF stmbl1:OPEN_HARDWARE_1 LOGO 0 40 Y Y 1 F N
+DEF stmbl:OPEN_HARDWARE_1 LOGO 0 40 Y Y 1 F N
 F0 "LOGO" 0 275 50 H V C CNN
-F1 "stmbl1:OPEN_HARDWARE_1" 0 -225 50 H V C CNN
+F1 "stmbl:OPEN_HARDWARE_1" 0 -225 50 H V C CNN
 F2 "" 0 0 60 H I C CNN
 F3 "" 0 0 60 H I C CNN
 DRAW
@@ -637,11 +637,11 @@ P 277 0 1 0 132 -171 130 -170 125 -167 118 -162 109 -156 100 -150 93 -146 88 -14
 ENDDRAW
 ENDDEF
 #
-# stmbl1:R
+# stmbl:R
 #
-DEF stmbl1:R R 0 0 N Y 1 F N
+DEF stmbl:R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
-F1 "stmbl1:R" 0 0 50 V V C CNN
+F1 "stmbl:R" 0 0 50 V V C CNN
 F2 "" -70 0 50 V V C CNN
 F3 "" 0 0 50 H V C CNN
 $FPLIST
@@ -655,11 +655,11 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:RJ45_LED
+# stmbl:RJ45_LED
 #
-DEF stmbl1:RJ45_LED J 0 40 Y Y 1 F N
+DEF stmbl:RJ45_LED J 0 40 Y Y 1 F N
 F0 "J" 0 -500 50 H V C CNN
-F1 "stmbl1:RJ45_LED" 0 400 50 H V C CNN
+F1 "stmbl:RJ45_LED" 0 400 50 H V C CNN
 F2 "" 0 -50 60 H V C CNN
 F3 "" 0 -50 60 H V C CNN
 $FPLIST
@@ -762,11 +762,11 @@ X ~ 9 400 500 150 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:SI8621
+# stmbl:SI8621
 #
-DEF stmbl1:SI8621 U 0 40 Y Y 1 F N
+DEF stmbl:SI8621 U 0 40 Y Y 1 F N
 F0 "U" 550 -700 60 H V C CNN
-F1 "stmbl1:SI8621" 0 -650 60 H V C CNN
+F1 "stmbl:SI8621" 0 -650 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -799,11 +799,95 @@ X VDD2 8 350 700 200 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# stmbl1:STM32F405VG
+# stmbl:SP3485
 #
-DEF stmbl1:STM32F405VG U 0 40 Y Y 1 F N
+DEF stmbl:SP3485 U 0 40 Y Y 1 F N
+F0 "U" -300 350 50 H V L CNN
+F1 "stmbl:SP3485" 100 350 50 H V L CNN
+F2 "SO-8" 0 0 50 H V C CIN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ SO8*
+$ENDFPLIST
+DRAW
+S -300 300 300 -300 0 1 10 f
+X RO 1 -400 200 100 R 50 50 1 1 O
+X ~RE~ 2 -400 100 100 R 50 50 1 1 I
+X DE 3 -400 -100 100 R 50 50 1 1 I
+X DI 4 -400 -200 100 R 50 50 1 1 I
+X GND 5 0 -400 100 U 50 50 1 1 W
+X A 6 400 100 100 L 50 50 1 1 B
+X B 7 400 -100 100 L 50 50 1 1 B
+X VCC 8 0 400 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# stmbl:STM32F303CBTx
+#
+DEF stmbl:STM32F303CBTx U 0 40 Y Y 1 L N
+F0 "U" -500 1650 50 H V L BNN
+F1 "stmbl:STM32F303CBTx" 400 700 50 H V R BNN
+F2 "LQFP48" 200 650 50 H V R TNN
+F3 "" 450 100 50 H V C CNN
+ALIAS STM32F303CCTx
+DRAW
+S -500 -1400 500 1600 0 1 10 f
+X VBAT 1 -600 1100 100 R 50 50 1 1 W
+X PA0 10 600 200 100 L 50 50 1 1 B
+X PA1 11 600 100 100 L 50 50 1 1 B
+X PA2 12 600 0 100 L 50 50 1 1 B
+X PA3 13 600 -100 100 L 50 50 1 1 B
+X PA4 14 600 -200 100 L 50 50 1 1 B
+X PA5 15 600 -300 100 L 50 50 1 1 B
+X PA6 16 600 -400 100 L 50 50 1 1 B
+X PA7 17 600 -500 100 L 50 50 1 1 B
+X PB0 18 -600 200 100 R 50 50 1 1 B
+X PB1 19 -600 100 100 R 50 50 1 1 B
+X PC13 2 -600 600 100 R 50 50 1 1 B
+X PB2 20 -600 0 100 R 50 50 1 1 B
+X PB10 21 -600 -800 100 R 50 50 1 1 B
+X PB11 22 -600 -900 100 R 50 50 1 1 B
+X VSS 23 -100 -1500 100 U 50 50 1 1 W
+X VDD 24 -100 1700 100 D 50 50 1 1 W
+X PB12 25 -600 -1000 100 R 50 50 1 1 B
+X PB13 26 -600 -1100 100 R 50 50 1 1 B
+X PB14 27 -600 -1200 100 R 50 50 1 1 B
+X PB15 28 -600 -1300 100 R 50 50 1 1 B
+X PA8 29 600 -600 100 L 50 50 1 1 B
+X PC14 3 -600 500 100 R 50 50 1 1 B
+X PA9 30 600 -700 100 L 50 50 1 1 B
+X PA10 31 600 -800 100 L 50 50 1 1 B
+X PA11 32 600 -900 100 L 50 50 1 1 B
+X PA12 33 600 -1000 100 L 50 50 1 1 B
+X PA13 34 600 -1100 100 L 50 50 1 1 B
+X VSS 35 0 -1500 100 U 50 50 1 1 W
+X VDD 36 0 1700 100 D 50 50 1 1 W
+X PA14 37 600 -1200 100 L 50 50 1 1 B
+X PA15 38 600 -1300 100 L 50 50 1 1 B
+X PB3 39 -600 -100 100 R 50 50 1 1 B
+X PC15 4 -600 400 100 R 50 50 1 1 B
+X PB4 40 -600 -200 100 R 50 50 1 1 B
+X PB5 41 -600 -300 100 R 50 50 1 1 B
+X PB6 42 -600 -400 100 R 50 50 1 1 B
+X PB7 43 -600 -500 100 R 50 50 1 1 B
+X BOOT0 44 -600 1300 100 R 50 50 1 1 I
+X PB8 45 -600 -600 100 R 50 50 1 1 B
+X PB9 46 -600 -700 100 R 50 50 1 1 B
+X VSS 47 100 -1500 100 U 50 50 1 1 W
+X VDD 48 100 1700 100 D 50 50 1 1 W
+X PF0 5 -600 900 100 R 50 50 1 1 I
+X PF1 6 -600 800 100 R 50 50 1 1 I
+X NRST 7 -600 1500 100 R 50 50 1 1 I
+X VSSA 8 200 -1500 100 U 50 50 1 1 W
+X VDDA 9 200 1700 100 D 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# stmbl:STM32F405VG
+#
+DEF stmbl:STM32F405VG U 0 40 Y Y 1 F N
 F0 "U" 0 0 50 H V C CNN
-F1 "stmbl1:STM32F405VG" 0 100 50 H V C CNN
+F1 "stmbl:STM32F405VG" 0 100 50 H V C CNN
 F2 "TQFP100" 0 -100 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -911,11 +995,11 @@ X VSS 99 400 -3000 300 U 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# stmbl1:USBLC6-4SC6
+# stmbl:USBLC6-4SC6
 #
-DEF stmbl1:USBLC6-4SC6 U 0 40 Y Y 1 F N
+DEF stmbl:USBLC6-4SC6 U 0 40 Y Y 1 F N
 F0 "U" -699 348 50 H V C CNN
-F1 "stmbl1:USBLC6-4SC6" 0 250 50 H V C CNN
+F1 "stmbl:USBLC6-4SC6" 0 250 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 F4 "TRANSIENT VOLTAGE SUPPRESSOR" 0 -250 50 H V C CNN "Description"
@@ -930,11 +1014,11 @@ X I/O4 6 1050 100 298 L 50 50 1 1 U
 ENDDRAW
 ENDDEF
 #
-# stmbl1:USB_OTG
+# stmbl:USB_OTG
 #
-DEF stmbl1:USB_OTG P 0 40 Y Y 1 F N
+DEF stmbl:USB_OTG P 0 40 Y Y 1 F N
 F0 "P" 325 -125 50 H V C CNN
-F1 "stmbl1:USB_OTG" 0 200 50 H V C CNN
+F1 "stmbl:USB_OTG" 0 200 50 H V C CNN
 F2 "" -50 -100 50 V V C CNN
 F3 "" -50 -100 50 V V C CNN
 $FPLIST
@@ -956,11 +1040,11 @@ X shield 6 400 100 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:VPP
+# stmbl:VPP
 #
-DEF stmbl1:VPP #PWR 0 0 Y Y 1 F P
+DEF stmbl:VPP #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "stmbl1:VPP" 0 150 50 H V C CNN
+F1 "stmbl:VPP" 0 150 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -971,11 +1055,11 @@ X VPP 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# stmbl1:VR
+# stmbl:VR
 #
-DEF stmbl1:VR VR 0 0 N Y 1 F N
+DEF stmbl:VR VR 0 0 N Y 1 F N
 F0 "VR" 60 -46 50 V V C TNN
-F1 "stmbl1:VR" 0 0 50 V V C CNN
+F1 "stmbl:VR" 0 0 50 V V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -986,11 +1070,11 @@ X ~ 2 0 -250 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# stmbl1:lnk304D
+# stmbl:lnk304D
 #
-DEF stmbl1:lnk304D U 0 40 Y Y 1 F N
+DEF stmbl:lnk304D U 0 40 Y Y 1 F N
 F0 "U" -100 200 60 H V C CNN
-F1 "stmbl1:lnk304D" 0 -500 60 H V C CNN
+F1 "stmbl:lnk304D" 0 -500 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -1005,11 +1089,11 @@ X S 8 350 -400 200 L 50 50 1 1 w
 ENDDRAW
 ENDDEF
 #
-# stmbl1:non_plated
+# stmbl:non_plated
 #
-DEF stmbl1:non_plated U 0 40 Y Y 1 F N
+DEF stmbl:non_plated U 0 40 Y Y 1 F N
 F0 "U" 0 -350 60 H V C CNN
-F1 "stmbl1:non_plated" 50 250 60 H V C CNN
+F1 "stmbl:non_plated" 50 250 60 H V C CNN
 F2 "" 0 0 60 H I C CNN
 F3 "" 0 0 60 H I C CNN
 $FPLIST
@@ -1020,11 +1104,11 @@ C 0 0 150 0 1 0 N
 ENDDRAW
 ENDDEF
 #
-# stmbl1:testpoint
+# stmbl:testpoint
 #
-DEF stmbl1:testpoint T 0 40 Y Y 1 F N
+DEF stmbl:testpoint T 0 40 Y Y 1 F N
 F0 "T" 0 100 60 H V C CNN
-F1 "stmbl1:testpoint" 0 -100 60 H V C CNN
+F1 "stmbl:testpoint" 0 -100 60 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
@@ -1033,11 +1117,11 @@ X ~ 1 -200 0 200 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# stmbl1:zldo1117
+# stmbl:zldo1117
 #
-DEF stmbl1:zldo1117 U 0 30 Y Y 1 F N
+DEF stmbl:zldo1117 U 0 30 Y Y 1 F N
 F0 "U" 150 -196 50 H V C CNN
-F1 "stmbl1:zldo1117" 0 200 50 H V C CNN
+F1 "stmbl:zldo1117" 0 200 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -1048,87 +1132,4 @@ X VI 3 -400 50 200 R 40 40 1 1 I
 ENDDRAW
 ENDDEF
 #
-# stmbl_4.0-rescue:SP3485EN-RESCUE-stmbl_4.0
-#
-DEF stmbl_4.0-rescue:SP3485EN-RESCUE-stmbl_4.0 U 0 40 Y Y 1 F N
-F0 "U" -300 350 50 H V L CNN
-F1 "stmbl_4.0-rescue:SP3485EN-RESCUE-stmbl_4.0" 100 350 50 H V L CNN
-F2 "SO-8" 0 0 50 H V C CIN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- SO8*
-$ENDFPLIST
-DRAW
-S -300 300 300 -300 0 1 10 f
-X RO 1 -400 200 100 R 50 50 1 1 O
-X ~RE~ 2 -400 100 100 R 50 50 1 1 I
-X DE 3 -400 -100 100 R 50 50 1 1 I
-X DI 4 -400 -200 100 R 50 50 1 1 I
-X GND 5 0 -400 100 U 50 50 1 1 W
-X A 6 400 100 100 L 50 50 1 1 B
-X B 7 400 -100 100 L 50 50 1 1 B
-X VCC 8 0 400 100 D 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# stmbl_4.0-rescue:STM32F303CBTx-RESCUE-stmbl_4.0
-#
-DEF stmbl_4.0-rescue:STM32F303CBTx-RESCUE-stmbl_4.0 U 0 40 Y Y 1 L N
-F0 "U" -7200 1725 50 H V L BNN
-F1 "stmbl_4.0-rescue:STM32F303CBTx-RESCUE-stmbl_4.0" 7200 1725 50 H V R BNN
-F2 "LQFP48" 7200 1675 50 H V R TNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-S -7200 -1700 7200 1700 0 1 10 f
-X VBAT 1 -7300 1000 100 R 50 50 1 1 W
-X ADC1_IN1/COMP1_INM/COMP1_OUT/COMP7_INP/RTC_TAMP2/SYS_WKUP1/TIM2_CH1/TIM2_ETR/TIM8_BKIN/TIM8_ETR/TSC_G1_IO1/USART2_CTS/PA0 10 7300 100 100 L 50 50 1 1 B
-X ADC1_IN2/COMP1_INP/OPAMP1_VINP/OPAMP1_VINP_SEC/OPAMP3_VINP/OPAMP3_VINP_SEC/RTC_REFIN/TIM15_CH1N/TIM2_CH2/TSC_G1_IO2/USART2_DE/USART2_RTS/PA1 11 7300 0 100 L 50 50 1 1 B
-X ADC1_IN3/ADC3_EXTI2/ADC4_EXTI2/COMP2_INM/COMP2_OUT/OPAMP1_VOUT/TIM15_CH1/TIM2_CH3/TSC_G1_IO3/USART2_TX/PA2 12 7300 -100 100 L 50 50 1 1 B
-X ADC1_IN4/COMP2_INP/OPAMP1_VINM/OPAMP1_VINM_SEC/OPAMP1_VINP/OPAMP1_VINP_SEC/TIM15_CH2/TIM2_CH4/TSC_G1_IO4/USART2_RX/PA3 13 7300 -200 100 L 50 50 1 1 B
-X ADC2_IN1/COMP1_INM/COMP2_INM/COMP3_INM/COMP4_INM/COMP5_INM/COMP6_INM/COMP7_INM/DAC_OUT1/I2S3_WS/OPAMP4_VINP/OPAMP4_VINP_SEC/SPI1_NSS/SPI3_NSS/TIM3_CH2/TSC_G2_IO1/USART2_CK/PA4 14 7300 -300 100 L 50 50 1 1 B
-X ADC2_IN2/COMP1_INM/COMP2_INM/COMP3_INM/COMP4_INM/COMP5_INM/COMP6_INM/COMP7_INM/DAC_OUT2/OPAMP1_VINP/OPAMP1_VINP_SEC/OPAMP2_VINM/OPAMP2_VINM_SEC/OPAMP3_VINP/OPAMP3_VINP_SEC/SPI1_SCK/TIM2_CH1/TIM2_ETR/TSC_G2_IO2/PA5 15 7300 -400 100 L 50 50 1 1 B
-X ADC2_IN3/COMP1_OUT/OPAMP2_VOUT/SPI1_MISO/TIM16_CH1/TIM1_BKIN/TIM3_CH1/TIM8_BKIN/TSC_G2_IO3/PA6 16 7300 -500 100 L 50 50 1 1 B
-X ADC2_IN4/COMP2_INP/COMP2_OUT/OPAMP1_VINP/OPAMP1_VINP_SEC/OPAMP2_VINP/OPAMP2_VINP_SEC/SPI1_MOSI/TIM17_CH1/TIM1_CH1N/TIM3_CH2/TIM8_CH1N/TSC_G2_IO4/PA7 17 7300 -600 100 L 50 50 1 1 B
-X PB0/ADC3_IN12/COMP4_INP/OPAMP2_VINP/OPAMP2_VINP_SEC/OPAMP3_VINP/OPAMP3_VINP_SEC/TIM1_CH2N/TIM3_CH3/TIM8_CH2N/TSC_G3_IO2 18 -7300 100 100 R 50 50 1 1 B
-X PB1/ADC3_IN1/COMP4_OUT/OPAMP3_VOUT/TIM1_CH3N/TIM3_CH4/TIM8_CH3N/TSC_G3_IO3 19 -7300 0 100 R 50 50 1 1 B
-X PC13/RTC_OUT_ALARM/RTC_OUT_CALIB/RTC_TAMP1/RTC_TS/SYS_WKUP2/TIM1_CH1N 2 -7300 500 100 R 50 50 1 1 B
-X PB2/ADC2_IN12/ADC3_EXTI2/ADC4_EXTI2/COMP4_INM/OPAMP3_VINM/OPAMP3_VINM_SEC/TSC_G3_IO4 20 -7300 -100 100 R 50 50 1 1 B
-X PB10/COMP5_INM/OPAMP3_VINM/OPAMP3_VINM_SEC/OPAMP4_VINM/OPAMP4_VINM_SEC/TIM2_CH3/TSC_SYNC/USART3_TX 21 -7300 -900 100 R 50 50 1 1 B
-X PB11/ADC1_EXTI11/ADC2_EXTI11/COMP6_INP/OPAMP4_VINP/OPAMP4_VINP_SEC/TIM2_CH4/TSC_G6_IO1/USART3_RX 22 -7300 -1000 100 R 50 50 1 1 B
-X VSS 23 -200 -1800 100 U 50 50 1 1 W
-X VDD 24 -200 1800 100 D 50 50 1 1 W
-X PB12/ADC4_IN3/COMP3_INM/I2C2_SMBA/I2S2_WS/OPAMP4_VOUT/SPI2_NSS/TIM1_BKIN/TSC_G6_IO2/USART3_CK 25 -7300 -1100 100 R 50 50 1 1 B
-X PB13/ADC3_IN5/COMP5_INP/I2S2_CK/OPAMP3_VINP/OPAMP3_VINP_SEC/OPAMP4_VINP/OPAMP4_VINP_SEC/SPI2_SCK/TIM1_CH1N/TSC_G6_IO3/USART3_CTS 26 -7300 -1200 100 R 50 50 1 1 B
-X PB14/ADC4_IN4/COMP3_INP/I2S2_ext_SD/OPAMP2_VINP/OPAMP2_VINP_SEC/SPI2_MISO/TIM15_CH1/TIM1_CH2N/TSC_G6_IO4/USART3_DE/USART3_RTS 27 -7300 -1300 100 R 50 50 1 1 B
-X PB15/ADC1_EXTI15/ADC2_EXTI15/ADC4_IN5/COMP6_INM/I2S2_SD/RTC_REFIN/SPI2_MOSI/TIM15_CH1N/TIM15_CH2/TIM1_CH3N 28 -7300 -1400 100 R 50 50 1 1 B
-X COMP3_OUT/I2C2_SMBA/I2S2_MCK/RCC_MCO/TIM1_CH1/TIM4_ETR/USART1_CK/PA8 29 7300 -700 100 L 50 50 1 1 B
-X PC14/RCC_OSC32_IN 3 -7300 400 100 R 50 50 1 1 B
-X COMP5_OUT/DAC_EXTI9/I2C2_SCL/I2S3_MCK/TIM15_BKIN/TIM1_CH2/TIM2_CH3/TSC_G4_IO1/USART1_TX/PA9 30 7300 -800 100 L 50 50 1 1 B
-X COMP6_OUT/I2C2_SDA/TIM17_BKIN/TIM1_CH3/TIM2_CH4/TIM8_BKIN/TSC_G4_IO2/USART1_RX/PA10 31 7300 -900 100 L 50 50 1 1 B
-X ADC1_EXTI11/ADC2_EXTI11/CAN_RX/COMP1_OUT/TIM1_BKIN2/TIM1_CH1N/TIM1_CH4/TIM4_CH1/USART1_CTS/USB_DM/PA11 32 7300 -1000 100 L 50 50 1 1 B
-X CAN_TX/COMP2_OUT/TIM16_CH1/TIM1_CH2N/TIM1_ETR/TIM4_CH2/USART1_DE/USART1_RTS/USB_DP/PA12 33 7300 -1100 100 L 50 50 1 1 B
-X IR_OUT/SYS_JTMS-SWDIO/TIM16_CH1N/TIM4_CH3/TSC_G4_IO3/USART3_CTS/PA13 34 7300 -1200 100 L 50 50 1 1 B
-X VSS 35 -100 -1800 100 U 50 50 1 1 W
-X VDD 36 -100 1800 100 D 50 50 1 1 W
-X I2C1_SDA/SYS_JTCK-SWCLK/TIM1_BKIN/TIM8_CH2/TSC_G4_IO4/USART2_TX/PA14 37 7300 -1300 100 L 50 50 1 1 B
-X ADC1_EXTI15/ADC2_EXTI15/I2C1_SCL/I2S3_WS/SPI1_NSS/SPI3_NSS/SYS_JTDI/TIM1_BKIN/TIM2_CH1/TIM2_ETR/TIM8_CH1/USART2_RX/PA15 38 7300 -1400 100 L 50 50 1 1 B
-X PB3/I2S3_CK/SPI1_SCK/SPI3_SCK/SYS_JTDO-TRACESWO/TIM2_CH2/TIM3_ETR/TIM4_ETR/TIM8_CH1N/TSC_G5_IO1/USART2_TX 39 -7300 -200 100 R 50 50 1 1 B
-X PC15/ADC1_EXTI15/ADC2_EXTI15/RCC_OSC32_OUT 4 -7300 300 100 R 50 50 1 1 B
-X PB4/I2S3_ext_SD/SPI1_MISO/SPI3_MISO/SYS_NJTRST/TIM16_CH1/TIM17_BKIN/TIM3_CH1/TIM8_CH2N/TSC_G5_IO2/USART2_RX 40 -7300 -300 100 R 50 50 1 1 B
-X PB5/I2C1_SMBA/I2S3_SD/SPI1_MOSI/SPI3_MOSI/TIM16_BKIN/TIM17_CH1/TIM3_CH2/TIM8_CH3N/USART2_CK 41 -7300 -400 100 R 50 50 1 1 B
-X PB6/I2C1_SCL/TIM16_CH1N/TIM4_CH1/TIM8_BKIN2/TIM8_CH1/TIM8_ETR/TSC_G5_IO3/USART1_TX 42 -7300 -500 100 R 50 50 1 1 B
-X PB7/I2C1_SDA/TIM17_CH1N/TIM3_CH4/TIM4_CH2/TIM8_BKIN/TSC_G5_IO4/USART1_RX 43 -7300 -600 100 R 50 50 1 1 B
-X BOOT0 44 -7300 1200 100 R 50 50 1 1 I
-X PB8/CAN_RX/COMP1_OUT/I2C1_SCL/TIM16_CH1/TIM1_BKIN/TIM4_CH3/TIM8_CH2/TSC_SYNC 45 -7300 -700 100 R 50 50 1 1 B
-X PB9/CAN_TX/COMP2_OUT/DAC_EXTI9/I2C1_SDA/IR_OUT/TIM17_CH1/TIM4_CH4/TIM8_CH3 46 -7300 -800 100 R 50 50 1 1 B
-X VSS 47 0 -1800 100 U 50 50 1 1 W
-X VDD 48 0 1800 100 D 50 50 1 1 W
-X PF0/I2C2_SDA/RCC_OSC_IN/TIM1_CH3N 5 -7300 800 100 R 50 50 1 1 I
-X PF1/I2C2_SCL/RCC_OSC_OUT 6 -7300 700 100 R 50 50 1 1 I
-X NRST 7 -7300 1400 100 R 50 50 1 1 I
-X VSSA 8 100 -1800 100 U 50 50 1 1 W
-X VDDA 9 100 1800 100 D 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
 #End Library
diff --git a/hw/kicad/v4.0/stmbl_4.0.kicad_pcb b/hw/kicad/v4.0/stmbl_4.0.kicad_pcb
index 6ef637e3..f213dd6d 100644
--- a/hw/kicad/v4.0/stmbl_4.0.kicad_pcb
+++ b/hw/kicad/v4.0/stmbl_4.0.kicad_pcb
@@ -6,7 +6,7 @@
     (tracks 3806)
     (zones 0)
     (modules 420)
-    (nets 237)
+    (nets 227)
   )
 
   (page A4)
@@ -325,16 +325,6 @@
   (net 224 "Net-(C41-Pad2)")
   (net 225 "Net-(C51-Pad1)")
   (net 226 "Net-(C141-Pad2)")
-  (net 227 "Net-(P1-Pad1)")
-  (net 228 "Net-(P1-Pad4)")
-  (net 229 "Net-(P11-Pad1)")
-  (net 230 "Net-(P11-Pad4)")
-  (net 231 "Net-(U1-Pad4)")
-  (net 232 "Net-(U1-Pad6)")
-  (net 233 "Net-(U4-Pad3)")
-  (net 234 "Net-(U13-Pad3)")
-  (net 235 "Net-(U21-Pad4)")
-  (net 236 "Net-(U27-Pad3)")
 
   (net_class Default "This is the default net class."
     (clearance 0.15)
@@ -523,14 +513,10 @@
     (add_net "Net-(J3-Pad9)")
     (add_net "Net-(JP1-Pad2)")
     (add_net "Net-(JP9-Pad2)")
-    (add_net "Net-(P1-Pad1)")
     (add_net "Net-(P1-Pad2)")
     (add_net "Net-(P1-Pad3)")
-    (add_net "Net-(P1-Pad4)")
-    (add_net "Net-(P11-Pad1)")
     (add_net "Net-(P11-Pad2)")
     (add_net "Net-(P11-Pad3)")
-    (add_net "Net-(P11-Pad4)")
     (add_net "Net-(P2-Pad1)")
     (add_net "Net-(P9-Pad2)")
     (add_net "Net-(P9-Pad5)")
@@ -569,12 +555,6 @@
     (add_net "Net-(T44-Pad1)")
     (add_net "Net-(T45-Pad1)")
     (add_net "Net-(T46-Pad1)")
-    (add_net "Net-(U1-Pad4)")
-    (add_net "Net-(U1-Pad6)")
-    (add_net "Net-(U13-Pad3)")
-    (add_net "Net-(U21-Pad4)")
-    (add_net "Net-(U27-Pad3)")
-    (add_net "Net-(U4-Pad3)")
   )
 
   (net_class UVW ""
@@ -1591,8 +1571,7 @@
       (net 4 GNDPWR))
     (pad 3 smd roundrect (at -1.2 0.95 270) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 153 /hv/f3/SWCLK))
-    (pad 4 smd roundrect (at 1.2 0.95 270) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
-      (net 235 "Net-(U21-Pad4)"))
+    (pad 4 smd roundrect (at 1.2 0.95 270) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25))
     (pad 6 smd roundrect (at 1.2 -0.95 270) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 148 /hv/f3/NRST))
     (pad 5 smd roundrect (at 1.2 0 270) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
@@ -1667,10 +1646,8 @@
       (net 2 GND))
     (pad 3 smd roundrect (at -1.2 0.95 270) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 116 "Net-(P1-Pad3)"))
-    (pad 4 smd roundrect (at 1.2 0.95 270) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
-      (net 231 "Net-(U1-Pad4)"))
-    (pad 6 smd roundrect (at 1.2 -0.95 270) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
-      (net 232 "Net-(U1-Pad6)"))
+    (pad 4 smd roundrect (at 1.2 0.95 270) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25))
+    (pad 6 smd roundrect (at 1.2 -0.95 270) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25))
     (pad 5 smd roundrect (at 1.2 0 270) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 10 +3V3))
     (model TO_SOT_Packages_SMD.3dshapes/SOT-23-6.wrl
@@ -1703,8 +1680,7 @@
       (net 9 "Net-(C15-Pad2)"))
     (pad 2 smd roundrect (at -1.2 0 90) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 39 +15V))
-    (pad 3 smd roundrect (at -1.2 0.95 90) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
-      (net 233 "Net-(U4-Pad3)"))
+    (pad 3 smd roundrect (at -1.2 0.95 90) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25))
     (pad 4 smd roundrect (at 1.2 0.95 90) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 129 "Net-(R19-Pad1)"))
     (pad 6 smd roundrect (at 1.2 -0.95 90) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
@@ -1741,8 +1717,7 @@
       (net 125 "Net-(C105-Pad2)"))
     (pad 2 smd roundrect (at -1.2 0) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 44 +24V))
-    (pad 3 smd roundrect (at -1.2 0.95) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
-      (net 234 "Net-(U13-Pad3)"))
+    (pad 3 smd roundrect (at -1.2 0.95) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25))
     (pad 4 smd roundrect (at 1.2 0.95) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 133 "Net-(R35-Pad1)"))
     (pad 6 smd roundrect (at 1.2 -0.95) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
@@ -1779,8 +1754,7 @@
       (net 127 "Net-(C106-Pad2)"))
     (pad 2 smd roundrect (at -1.2 0) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 44 +24V))
-    (pad 3 smd roundrect (at -1.2 0.95) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
-      (net 236 "Net-(U27-Pad3)"))
+    (pad 3 smd roundrect (at -1.2 0.95) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25))
     (pad 4 smd roundrect (at 1.2 0.95) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 155 "Net-(R59-Pad1)"))
     (pad 6 smd roundrect (at 1.2 -0.95) (size 1 0.475) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
@@ -3384,14 +3358,12 @@
     (fp_line (start 4 -2.75) (end -4 -2.75) (layer F.SilkS) (width 0.15))
     (fp_line (start 3.75 2.75) (end -3.75 2.75) (layer F.SilkS) (width 0.15))
     (fp_line (start -3.75 -2.25) (end 3.75 -2.25) (layer F.SilkS) (width 0.15))
-    (pad 1 smd roundrect (at 1.3 2.75 180) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
-      (net 229 "Net-(P11-Pad1)"))
+    (pad 1 smd roundrect (at 1.3 2.75 180) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25))
     (pad 2 smd roundrect (at 0.65 2.75 180) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 202 "Net-(P11-Pad2)"))
     (pad 3 smd roundrect (at 0 2.75 180) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 203 "Net-(P11-Pad3)"))
-    (pad 4 smd roundrect (at -0.65 2.75 180) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
-      (net 230 "Net-(P11-Pad4)"))
+    (pad 4 smd roundrect (at -0.65 2.75 180) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25))
     (pad 5 smd roundrect (at -1.3 2.75 180) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 4 GNDPWR))
     (pad 6 thru_hole circle (at 2.5 2.7 180) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.Paste)
@@ -3430,14 +3402,12 @@
     (fp_line (start 4 -2.75) (end -4 -2.75) (layer F.SilkS) (width 0.15))
     (fp_line (start 3.75 2.75) (end -3.75 2.75) (layer F.SilkS) (width 0.15))
     (fp_line (start -3.75 -2.25) (end 3.75 -2.25) (layer F.SilkS) (width 0.15))
-    (pad 1 smd roundrect (at 1.3 2.75 270) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
-      (net 227 "Net-(P1-Pad1)"))
+    (pad 1 smd roundrect (at 1.3 2.75 270) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25))
     (pad 2 smd roundrect (at 0.65 2.75 270) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 117 "Net-(P1-Pad2)"))
     (pad 3 smd roundrect (at 0 2.75 270) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 116 "Net-(P1-Pad3)"))
-    (pad 4 smd roundrect (at -0.65 2.75 270) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
-      (net 228 "Net-(P1-Pad4)"))
+    (pad 4 smd roundrect (at -0.65 2.75 270) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25))
     (pad 5 smd roundrect (at -1.3 2.75 270) (size 1.35 0.4) (layers F.Cu F.Paste F.Mask)(roundrect_rratio 0.25)
       (net 2 GND))
     (pad 6 thru_hole circle (at 2.5 2.7 270) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.Paste)
diff --git a/hw/kicad/v4.0/stmbl_4.0.net b/hw/kicad/v4.0/stmbl_4.0.net
index c46fde18..722acd2d 100644
--- a/hw/kicad/v4.0/stmbl_4.0.net
+++ b/hw/kicad/v4.0/stmbl_4.0.net
@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source /Users/crinq/sandbox/stmbl2/hw/kicad/v4.0/stmbl_4.0.sch)
-    (date "2018 April 05, Thursday 16:35:23")
+    (date "2018 April 05, Thursday 17:53:25")
     (tool "Eeschema (2018-01-10 revision 7e6a654)-master")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -165,7 +165,7 @@
         (field (name "Manufacturer No") Si8621BB-B-IS)
         (field (name Voltage) " ")
         (field (name Source) " "))
-      (libsource (lib stmbl1) (part SI8621))
+      (libsource (lib stmbl) (part SI8621))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 56590991))
     (comp (ref C19)
@@ -176,7 +176,7 @@
         (field (name Voltage) 50V)
         (field (name Source) " ")
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 566A3B64))
     (comp (ref C30)
@@ -187,13 +187,13 @@
         (field (name Voltage) 50V)
         (field (name Source) " ")
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 566A4471))
     (comp (ref P13)
       (value CONN_01X04)
       (footprint stmbl:Socket_Strip_Straight_1x04)
-      (libsource (lib stmbl1) (part CONN_01X04))
+      (libsource (lib stmbl) (part CONN_01X04))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 57AEC939))
     (comp (ref P2)
@@ -204,7 +204,7 @@
         (field (name Voltage) " ")
         (field (name Source) " ")
         (field (name Tolerance) " "))
-      (libsource (lib stmbl1) (part CONN_01X02))
+      (libsource (lib stmbl) (part CONN_01X02))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 57DC49A6))
     (comp (ref R142)
@@ -215,7 +215,7 @@
         (field (name Voltage) " ")
         (field (name Source) " ")
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 57DCE6B7))
     (comp (ref C127)
@@ -226,7 +226,7 @@
         (field (name Voltage) 50V)
         (field (name Source) " ")
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 57DCE80A))
     (comp (ref R141)
@@ -236,7 +236,7 @@
         (field (name "Manufacturer No") " ")
         (field (name Source) " ")
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 57DD09BB))
     (comp (ref R7)
@@ -247,25 +247,25 @@
         (field (name Voltage) " ")
         (field (name Source) " ")
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 57DD2315))
     (comp (ref U24)
       (value non_plated)
       (footprint stmbl:non_plated_3mm)
-      (libsource (lib stmbl1) (part non_plated))
+      (libsource (lib stmbl) (part non_plated))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 58275572))
     (comp (ref U30)
       (value non_plated)
       (footprint stmbl:non_plated_3mm)
-      (libsource (lib stmbl1) (part non_plated))
+      (libsource (lib stmbl) (part non_plated))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 582756C2))
     (comp (ref U31)
       (value non_plated)
       (footprint stmbl:non_plated_3mm)
-      (libsource (lib stmbl1) (part non_plated))
+      (libsource (lib stmbl) (part non_plated))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 58275820))
     (comp (ref C138)
@@ -276,7 +276,7 @@
         (field (name Voltage) 50V)
         (field (name Source) " ")
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 58307AEE))
     (comp (ref C40)
@@ -287,7 +287,7 @@
         (field (name Voltage) 50V)
         (field (name Source) " ")
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 5886523B))
     (comp (ref R162)
@@ -298,7 +298,7 @@
         (field (name Voltage) " ")
         (field (name Source) " ")
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/) (tstamps /5659094D/))
       (tstamp 58871945))
     (comp (ref C78)
@@ -307,7 +307,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 5663136E))
     (comp (ref C79)
@@ -316,7 +316,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 56631543))
     (comp (ref C82)
@@ -325,7 +325,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 5663155A))
     (comp (ref C83)
@@ -334,7 +334,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 56631574))
     (comp (ref Y1)
@@ -343,7 +343,7 @@
       (fields
         (field (name "Manufacturer No") ABM3B-8.000MHZ-10-1UT)
         (field (name Source) https://de.aliexpress.com/item/1LOT-10PCS-Crystal-8MHZ-20PF-20PPM-4P-5032-SeriesYSX531SL/32534814045.html))
-      (libsource (lib stmbl1) (part Crystal))
+      (libsource (lib stmbl) (part Crystal))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 56631593))
     (comp (ref C5)
@@ -352,7 +352,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 56631605))
     (comp (ref C6)
@@ -361,7 +361,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 566316C7))
     (comp (ref C2)
@@ -370,7 +370,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 566317E6))
     (comp (ref C7)
@@ -379,14 +379,14 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 56631C3B))
     (comp (ref P12)
       (value CONN_01X04)
       (footprint stmbl:Pin_Header_Straight_1x04)
       (fields)
-      (libsource (lib stmbl1) (part CONN_01X04))
+      (libsource (lib stmbl) (part CONN_01X04))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 5663248E))
     (comp (ref R2)
@@ -394,14 +394,14 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 566A7D18))
     (comp (ref JP1)
       (value Jumper_NO_Small)
       (footprint stmbl:SOLDER_JUMPER)
       (fields)
-      (libsource (lib stmbl1) (part Jumper_NO_Small))
+      (libsource (lib stmbl) (part Jumper_NO_Small))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 566A7FD4))
     (comp (ref U21)
@@ -413,7 +413,7 @@
         (field (name Source) " ")
         (field (name Tolerance) " ")
         (field (name Description) "TRANSIENT VOLTAGE SUPPRESSOR"))
-      (libsource (lib stmbl1) (part USBLC6-4SC6))
+      (libsource (lib stmbl) (part USBLC6-4SC6))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 56820F0C))
     (comp (ref U25)
@@ -421,7 +421,7 @@
       (footprint stmbl:LQFP-48_7x7mm_Pitch0.5mm)
       (fields
         (field (name "Manufacturer No") STM32F303CBT))
-      (libsource (lib stmbl_4.0-rescue) (part STM32F303CBTx-RESCUE-stmbl_4.0))
+      (libsource (lib stmbl) (part STM32F303CBTx))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 570DA682))
     (comp (ref R129)
@@ -429,35 +429,35 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 570E4A7D))
     (comp (ref T45)
       (value testpoint)
       (footprint stmbl:Measurement_Point_Round-SMD-Pad_Small)
       (fields)
-      (libsource (lib stmbl1) (part testpoint))
+      (libsource (lib stmbl) (part testpoint))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 57750CEC))
     (comp (ref T44)
       (value testpoint)
       (footprint stmbl:Measurement_Point_Round-SMD-Pad_Small)
       (fields)
-      (libsource (lib stmbl1) (part testpoint))
+      (libsource (lib stmbl) (part testpoint))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 57751000))
     (comp (ref T46)
       (value testpoint)
       (footprint stmbl:Measurement_Point_Round-SMD-Pad_Small)
       (fields)
-      (libsource (lib stmbl1) (part testpoint))
+      (libsource (lib stmbl) (part testpoint))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 5775117B))
     (comp (ref T1)
       (value testpoint)
       (footprint stmbl:Measurement_Point_Round-SMD-Pad_Small)
       (fields)
-      (libsource (lib stmbl1) (part testpoint))
+      (libsource (lib stmbl) (part testpoint))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 57751F4A))
     (comp (ref D1)
@@ -465,7 +465,7 @@
       (footprint stmbl:LED-0805-SIDE)
       (fields
         (field (name "Manufacturer No") LTST-S220KRKT))
-      (libsource (lib stmbl1) (part LED))
+      (libsource (lib stmbl) (part LED))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 5776010E))
     (comp (ref R8)
@@ -473,7 +473,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 57760220))
     (comp (ref L1)
@@ -482,7 +482,7 @@
       (fields
         (field (name "Manufacturer No") BLM18AG221SN1)
         (field (name Source) https://de.aliexpress.com/item/500-PCS-LOT-patch-magnetic-bead-FB-BLM18AG221SN1-0603-220-r-0-5-A-magnetic-beads/32675343247.html))
-      (libsource (lib stmbl1) (part INDUCTOR))
+      (libsource (lib stmbl) (part INDUCTOR))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 57B2E566))
     (comp (ref C10)
@@ -491,7 +491,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 57B2E6B6))
     (comp (ref C9)
@@ -500,7 +500,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 57B30D45))
     (comp (ref U29)
@@ -511,7 +511,7 @@
         (field (name Voltage) " ")
         (field (name Source) " ")
         (field (name Tolerance) " "))
-      (libsource (lib stmbl1) (part USBLC6-4SC6))
+      (libsource (lib stmbl) (part USBLC6-4SC6))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 57DEBE00))
     (comp (ref C128)
@@ -520,7 +520,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 57DF402E))
     (comp (ref P11)
@@ -529,7 +529,7 @@
       (fields
         (field (name "Manufacturer No") 105017-0001)
         (field (name Source) https://de.aliexpress.com/item/Wholesale-100Pcs-lot-5-Pins-Micro-USB-SMD-Female-USB-PCB-Connector-Socket-USB-Jack-Plug/1840320498.html))
-      (libsource (lib stmbl1) (part USB_OTG))
+      (libsource (lib stmbl) (part USB_OTG))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 582597E3))
     (comp (ref R151)
@@ -537,7 +537,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 5825AC16))
     (comp (ref R152)
@@ -545,7 +545,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 5825B725))
     (comp (ref R150)
@@ -553,7 +553,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 5825B8D4))
     (comp (ref R118)
@@ -561,21 +561,21 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 582CAB11))
     (comp (ref P7)
       (value CONN_01X04)
       (footprint stmbl:Pin_Header_Straight_1x04)
       (fields)
-      (libsource (lib stmbl1) (part CONN_01X04))
+      (libsource (lib stmbl) (part CONN_01X04))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 5834327D))
     (comp (ref T2)
       (value testpoint)
       (footprint stmbl:Measurement_Point_Round-SMD-Pad_Small)
       (fields)
-      (libsource (lib stmbl1) (part testpoint))
+      (libsource (lib stmbl) (part testpoint))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 5AC8A042))
     (comp (ref C141)
@@ -584,7 +584,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/f3/) (tstamps /5659094D/565909D0/))
       (tstamp 5AD22026))
     (comp (ref D10)
@@ -592,7 +592,7 @@
       (footprint stmbl:SMA_Standard)
       (fields
         (field (name "Manufacturer No") ES1J-LTP))
-      (libsource (lib stmbl1) (part D))
+      (libsource (lib stmbl) (part D))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 56657C30))
     (comp (ref D11)
@@ -600,7 +600,7 @@
       (footprint stmbl:SMA_Standard)
       (fields
         (field (name "Manufacturer No") ES1J-LTP))
-      (libsource (lib stmbl1) (part D))
+      (libsource (lib stmbl) (part D))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 56657CAE))
     (comp (ref L2)
@@ -608,7 +608,7 @@
       (footprint stmbl:NPI31W)
       (fields
         (field (name "Manufacturer No") DT3316P-105))
-      (libsource (lib stmbl1) (part INDUCTOR))
+      (libsource (lib stmbl) (part INDUCTOR))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 56657DB8))
     (comp (ref C58)
@@ -617,7 +617,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 56657F29))
     (comp (ref C51)
@@ -626,7 +626,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 5774AD7A))
     (comp (ref C41)
@@ -635,7 +635,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 5774B2A5))
     (comp (ref R91)
@@ -643,7 +643,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 5774B784))
     (comp (ref R92)
@@ -651,7 +651,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 5774BB53))
     (comp (ref D8)
@@ -659,7 +659,7 @@
       (footprint stmbl:LED-0805-SIDE)
       (fields
         (field (name "Manufacturer No") LTST-S220KGKT))
-      (libsource (lib stmbl1) (part LED))
+      (libsource (lib stmbl) (part LED))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 57752985))
     (comp (ref R75)
@@ -667,7 +667,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 57752B29))
     (comp (ref R21)
@@ -675,7 +675,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 57828197))
     (comp (ref R19)
@@ -683,7 +683,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 5782819E))
     (comp (ref D6)
@@ -691,7 +691,7 @@
       (footprint stmbl:SMA_Standard)
       (fields
         (field (name "Manufacturer No") SS34A))
-      (libsource (lib stmbl1) (part D_Schottky))
+      (libsource (lib stmbl) (part D_Schottky))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 578281A5))
     (comp (ref C15)
@@ -700,7 +700,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 578281AC))
     (comp (ref L4)
@@ -708,7 +708,7 @@
       (footprint stmbl:SMD_INDUCTOR_32x25)
       (fields
         (field (name "Manufacturer No") LQH32PN100MNCL))
-      (libsource (lib stmbl1) (part INDUCTOR))
+      (libsource (lib stmbl) (part INDUCTOR))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 578281B3))
     (comp (ref U4)
@@ -716,7 +716,7 @@
       (footprint stmbl:SOT-23-6)
       (fields
         (field (name "Manufacturer No") ACT4088US))
-      (libsource (lib stmbl1) (part ACT4088))
+      (libsource (lib stmbl) (part ACT4088))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 578281C8))
     (comp (ref R30)
@@ -724,7 +724,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 57B00182))
     (comp (ref C35)
@@ -733,7 +733,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 57B2A7C0))
     (comp (ref C60)
@@ -742,7 +742,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 57B2A8C5))
     (comp (ref U5)
@@ -750,7 +750,7 @@
       (footprint stmbl:SOIC-7)
       (fields
         (field (name "Manufacturer No") LNK304DN))
-      (libsource (lib stmbl1) (part lnk304D))
+      (libsource (lib stmbl) (part lnk304D))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 57F9295B))
     (comp (ref C3)
@@ -760,7 +760,7 @@
         (field (name "Manufacturer No") C1808W154KCRACTU)
         (field (name Voltage) 500V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 58068ABB))
     (comp (ref R15)
@@ -768,7 +768,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 5812BBA8))
     (comp (ref R16)
@@ -776,7 +776,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 5813BF7B))
     (comp (ref R143)
@@ -784,7 +784,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 5813C2F5))
     (comp (ref C50)
@@ -793,7 +793,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 5824506F))
     (comp (ref C68)
@@ -802,7 +802,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 58254B38))
     (comp (ref C69)
@@ -811,7 +811,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 582564B2))
     (comp (ref C4)
@@ -820,7 +820,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 5825704C))
     (comp (ref R161)
@@ -828,7 +828,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 5886A2CE))
     (comp (ref C97)
@@ -837,7 +837,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 5886B864))
     (comp (ref C70)
@@ -845,7 +845,7 @@
       (footprint stmbl:C_Radial_D6.5_L11_P2.5)
       (fields
         (field (name Voltage) 50V))
-      (libsource (lib stmbl1) (part CP))
+      (libsource (lib stmbl) (part CP))
       (sheetpath (names "/hv/hv supply/") (tstamps /5659094D/565909D4/))
       (tstamp 5AC60AA6))
     (comp (ref R27)
@@ -854,7 +854,7 @@
       (fields
         (field (name Voltage) 200V)
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 566960D3))
     (comp (ref R28)
@@ -863,7 +863,7 @@
       (fields
         (field (name Voltage) 200V)
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 56696104))
     (comp (ref R29)
@@ -871,7 +871,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 56696127))
     (comp (ref R32)
@@ -880,7 +880,7 @@
       (fields
         (field (name Voltage) 200V)
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 5669628D))
     (comp (ref R33)
@@ -889,7 +889,7 @@
       (fields
         (field (name Voltage) 200V)
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 56696293))
     (comp (ref R34)
@@ -897,7 +897,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 56696299))
     (comp (ref R51)
@@ -906,7 +906,7 @@
       (fields
         (field (name Voltage) 200V)
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 56696338))
     (comp (ref R52)
@@ -915,7 +915,7 @@
       (fields
         (field (name Voltage) 200V)
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 5669633E))
     (comp (ref R53)
@@ -923,7 +923,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 56696344))
     (comp (ref R77)
@@ -932,7 +932,7 @@
       (fields
         (field (name Voltage) 200V)
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 566963D7))
     (comp (ref R78)
@@ -941,7 +941,7 @@
       (fields
         (field (name Voltage) 200V)
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 566963DD))
     (comp (ref R79)
@@ -949,7 +949,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 566963E3))
     (comp (ref C11)
@@ -958,7 +958,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 5682FF8E))
     (comp (ref C20)
@@ -967,7 +967,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 5683022A))
     (comp (ref C23)
@@ -976,7 +976,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 568302B9))
     (comp (ref C39)
@@ -985,7 +985,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/back-emf/) (tstamps /5659094D/56590A3E/))
       (tstamp 56830430))
     (comp (ref C21)
@@ -994,7 +994,7 @@
       (fields
         (field (name "Manufacturer No") ESMR401VSN271MQ30S)
         (field (name Voltage) 400V))
-      (libsource (lib stmbl1) (part CP))
+      (libsource (lib stmbl) (part CP))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 56590C91))
     (comp (ref C22)
@@ -1003,7 +1003,7 @@
       (fields
         (field (name "Manufacturer No") ESMR401VSN271MQ30S)
         (field (name Voltage) 400V))
-      (libsource (lib stmbl1) (part CP))
+      (libsource (lib stmbl) (part CP))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 56590CD1))
     (comp (ref C28)
@@ -1013,7 +1013,7 @@
         (field (name "Manufacturer No") C1808W154KCRACTU)
         (field (name Voltage) 500V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 56590D2C))
     (comp (ref C34)
@@ -1023,7 +1023,7 @@
         (field (name "Manufacturer No") C1808W154KCRACTU)
         (field (name Voltage) 500V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 56590D5B))
     (comp (ref C42)
@@ -1032,7 +1032,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 5659119D))
     (comp (ref U12)
@@ -1040,7 +1040,7 @@
       (footprint stmbl:IRAM256)
       (fields
         (field (name "Manufacturer No") IRAM256-2067A2))
-      (libsource (lib stmbl1) (part IRAM256a))
+      (libsource (lib stmbl) (part IRAM256a))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 5668DD3B))
     (comp (ref C43)
@@ -1049,7 +1049,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 5668E03D))
     (comp (ref C44)
@@ -1058,7 +1058,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 5668E1AC))
     (comp (ref R80)
@@ -1067,7 +1067,7 @@
       (fields
         (field (name "Manufacturer No") CSS2H-2512K-3L00F)
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 5668E2F9))
     (comp (ref R81)
@@ -1076,7 +1076,7 @@
       (fields
         (field (name "Manufacturer No") CSS2H-2512K-3L00F)
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 5668E493))
     (comp (ref R82)
@@ -1085,7 +1085,7 @@
       (fields
         (field (name "Manufacturer No") CSS2H-2512K-3L00F)
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 5668E4D6))
     (comp (ref C63)
@@ -1094,7 +1094,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 56690594))
     (comp (ref P8)
@@ -1102,7 +1102,7 @@
       (footprint stmbl:RM5.08_1x3)
       (fields
         (field (name "Manufacturer No") "Phoenix 1757255"))
-      (libsource (lib stmbl1) (part CONN_01X03))
+      (libsource (lib stmbl) (part CONN_01X03))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 566CEA04))
     (comp (ref P6)
@@ -1110,7 +1110,7 @@
       (footprint stmbl:RM5.08_1x2)
       (fields
         (field (name "Manufacturer No") "Phoenix 1757242"))
-      (libsource (lib stmbl1) (part CONN_01X02))
+      (libsource (lib stmbl) (part CONN_01X02))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 566CF01F))
     (comp (ref R115)
@@ -1118,7 +1118,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 566DE4EC))
     (comp (ref C38)
@@ -1128,7 +1128,7 @@
         (field (name "Manufacturer No") C1808W154KCRACTU)
         (field (name Voltage) 500V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 57779550))
     (comp (ref C93)
@@ -1138,7 +1138,7 @@
         (field (name "Manufacturer No") C1808W154KCRACTU)
         (field (name Voltage) 500V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 5777A039))
     (comp (ref C92)
@@ -1148,7 +1148,7 @@
         (field (name "Manufacturer No") C1808W154KCRACTU)
         (field (name Voltage) 500V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 5777A5B0))
     (comp (ref C129)
@@ -1157,7 +1157,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 57F703A4))
     (comp (ref C14)
@@ -1166,7 +1166,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 583034AA))
     (comp (ref C147)
@@ -1175,7 +1175,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/driver/) (tstamps /5659094D/56590A75/))
       (tstamp 58B0F177))
     (comp (ref R46)
@@ -1183,7 +1183,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/cur/) (tstamps /5659094D/57745B52/))
       (tstamp 5774716E))
     (comp (ref C33)
@@ -1192,7 +1192,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/cur/) (tstamps /5659094D/57745B52/))
       (tstamp 57747194))
     (comp (ref R58)
@@ -1200,7 +1200,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/cur/) (tstamps /5659094D/57745B52/))
       (tstamp 57747224))
     (comp (ref R84)
@@ -1208,7 +1208,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/cur/) (tstamps /5659094D/57745B52/))
       (tstamp 57747512))
     (comp (ref C45)
@@ -1217,7 +1217,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/cur/) (tstamps /5659094D/57745B52/))
       (tstamp 57747518))
     (comp (ref R90)
@@ -1225,7 +1225,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/cur/) (tstamps /5659094D/57745B52/))
       (tstamp 5774751E))
     (comp (ref R100)
@@ -1233,7 +1233,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/cur/) (tstamps /5659094D/57745B52/))
       (tstamp 57747687))
     (comp (ref C57)
@@ -1242,7 +1242,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /hv/cur/) (tstamps /5659094D/57745B52/))
       (tstamp 5774768D))
     (comp (ref R107)
@@ -1250,7 +1250,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /hv/cur/) (tstamps /5659094D/57745B52/))
       (tstamp 57747693))
     (comp (ref P14)
@@ -1260,19 +1260,19 @@
         (field (name "Manufacturer No") " ")
         (field (name Voltage) " ")
         (field (name Source) " "))
-      (libsource (lib stmbl1) (part CONN_01X04))
+      (libsource (lib stmbl) (part CONN_01X04))
       (sheetpath (names /ctrl/) (tstamps /56590966/))
       (tstamp 57AEB2FC))
     (comp (ref U32)
       (value non_plated)
       (footprint stmbl:non_plated_3mm)
-      (libsource (lib stmbl1) (part non_plated))
+      (libsource (lib stmbl) (part non_plated))
       (sheetpath (names /ctrl/) (tstamps /56590966/))
       (tstamp 5830D361))
     (comp (ref LOGO1)
       (value OPEN_HARDWARE_1)
       (footprint stmbl:Symbol_OSHW-Logo_SilkScreen)
-      (libsource (lib stmbl1) (part OPEN_HARDWARE_1))
+      (libsource (lib stmbl) (part OPEN_HARDWARE_1))
       (sheetpath (names /ctrl/) (tstamps /56590966/))
       (tstamp 58341DA7))
     (comp (ref U2)
@@ -1280,7 +1280,7 @@
       (footprint stmbl:SOT-223)
       (fields
         (field (name "Manufacturer No") ZLDO1117G33TA))
-      (libsource (lib stmbl1) (part zldo1117))
+      (libsource (lib stmbl) (part zldo1117))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 566074A9))
     (comp (ref C18)
@@ -1289,7 +1289,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 566075DC))
     (comp (ref C8)
@@ -1298,7 +1298,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 566076FA))
     (comp (ref P3)
@@ -1306,7 +1306,7 @@
       (footprint stmbl:akl182-2)
       (fields
         (field (name "Manufacturer No") "Phoenix 1844210"))
-      (libsource (lib stmbl1) (part CONN_01X02))
+      (libsource (lib stmbl) (part CONN_01X02))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 566CDEAC))
     (comp (ref C110)
@@ -1315,7 +1315,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD279A))
     (comp (ref R97)
@@ -1323,7 +1323,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD27A0))
     (comp (ref R59)
@@ -1331,7 +1331,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD27A6))
     (comp (ref D12)
@@ -1339,7 +1339,7 @@
       (footprint stmbl:SMA_Standard)
       (fields
         (field (name "Manufacturer No") SS34A))
-      (libsource (lib stmbl1) (part D_Schottky))
+      (libsource (lib stmbl) (part D_Schottky))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD27AC))
     (comp (ref C106)
@@ -1348,7 +1348,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD27B2))
     (comp (ref L6)
@@ -1356,7 +1356,7 @@
       (footprint stmbl:SMD_INDUCTOR_32x25)
       (fields
         (field (name "Manufacturer No") LQH32PN100MNCL))
-      (libsource (lib stmbl1) (part INDUCTOR))
+      (libsource (lib stmbl) (part INDUCTOR))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD27B8))
     (comp (ref C109)
@@ -1365,7 +1365,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD3DA2))
     (comp (ref R60)
@@ -1373,7 +1373,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD3DA8))
     (comp (ref R35)
@@ -1381,7 +1381,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD3DAE))
     (comp (ref D9)
@@ -1389,7 +1389,7 @@
       (footprint stmbl:SMA_Standard)
       (fields
         (field (name "Manufacturer No") SS34A))
-      (libsource (lib stmbl1) (part D_Schottky))
+      (libsource (lib stmbl) (part D_Schottky))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD3DB4))
     (comp (ref C105)
@@ -1398,7 +1398,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD3DBA))
     (comp (ref L5)
@@ -1406,7 +1406,7 @@
       (footprint stmbl:SMD_INDUCTOR_32x25)
       (fields
         (field (name "Manufacturer No") LQH32PN4R7NNC))
-      (libsource (lib stmbl1) (part INDUCTOR))
+      (libsource (lib stmbl) (part INDUCTOR))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD3DC0))
     (comp (ref U13)
@@ -1414,7 +1414,7 @@
       (footprint stmbl:SOT-23-6)
       (fields
         (field (name "Manufacturer No") ACT4088US))
-      (libsource (lib stmbl1) (part ACT4088))
+      (libsource (lib stmbl) (part ACT4088))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD3DD4))
     (comp (ref C96)
@@ -1423,7 +1423,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AF3925))
     (comp (ref C108)
@@ -1432,7 +1432,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AF3EB7))
     (comp (ref C107)
@@ -1441,7 +1441,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AF42AD))
     (comp (ref C103)
@@ -1450,7 +1450,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AF47AC))
     (comp (ref C104)
@@ -1459,7 +1459,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AF48FA))
     (comp (ref C99)
@@ -1468,7 +1468,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AF53FF))
     (comp (ref C111)
@@ -1477,7 +1477,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AF630D))
     (comp (ref C101)
@@ -1486,7 +1486,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57B21BDA))
     (comp (ref C102)
@@ -1495,7 +1495,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57B21C48))
     (comp (ref C123)
@@ -1504,7 +1504,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57D63C06))
     (comp (ref R133)
@@ -1512,7 +1512,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57D63C0C))
     (comp (ref D13)
@@ -1520,7 +1520,7 @@
       (footprint stmbl:SMA_Standard)
       (fields
         (field (name "Manufacturer No") SS34A))
-      (libsource (lib stmbl1) (part D_Schottky))
+      (libsource (lib stmbl) (part D_Schottky))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57D63C18))
     (comp (ref C121)
@@ -1529,7 +1529,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57D63C1E))
     (comp (ref L12)
@@ -1537,7 +1537,7 @@
       (footprint stmbl:SMD_INDUCTOR_32x25)
       (fields
         (field (name "Manufacturer No") LQH32PN4R7NNC))
-      (libsource (lib stmbl1) (part INDUCTOR))
+      (libsource (lib stmbl) (part INDUCTOR))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57D63C24))
     (comp (ref U28)
@@ -1545,7 +1545,7 @@
       (footprint stmbl:SOT-23-6)
       (fields
         (field (name "Manufacturer No") ACT4088US))
-      (libsource (lib stmbl1) (part ACT4088))
+      (libsource (lib stmbl) (part ACT4088))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57D63C38))
     (comp (ref C122)
@@ -1554,7 +1554,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57D63C68))
     (comp (ref C120)
@@ -1563,7 +1563,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57D63C71))
     (comp (ref C124)
@@ -1572,7 +1572,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57D63C7A))
     (comp (ref U27)
@@ -1580,14 +1580,14 @@
       (footprint stmbl:SOT-23-6)
       (fields
         (field (name "Manufacturer No") ACT4088US))
-      (libsource (lib stmbl1) (part ACT4088))
+      (libsource (lib stmbl) (part ACT4088))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57AD27CC))
     (comp (ref JP4)
       (value Jumper_NO_Small)
       (footprint stmbl:SOLDER_JUMPER)
       (fields)
-      (libsource (lib stmbl1) (part Jumper_NO_Small))
+      (libsource (lib stmbl) (part Jumper_NO_Small))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57D95B7C))
     (comp (ref R146)
@@ -1595,7 +1595,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5812447C))
     (comp (ref R145)
@@ -1603,7 +1603,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 581247B5))
     (comp (ref R144)
@@ -1611,7 +1611,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 581254D2))
     (comp (ref D22)
@@ -1619,7 +1619,7 @@
       (footprint stmbl:SMA_Standard)
       (fields
         (field (name "Manufacturer No") SMAJ24A-TR))
-      (libsource (lib stmbl1) (part D_Schottky))
+      (libsource (lib stmbl) (part D_Schottky))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 581AE161))
     (comp (ref R149)
@@ -1627,7 +1627,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5817A2EE))
     (comp (ref D24)
@@ -1635,7 +1635,7 @@
       (footprint stmbl:LED-0805-SIDE)
       (fields
         (field (name "Manufacturer No") LTST-S220KGKT))
-      (libsource (lib stmbl1) (part Led_Small))
+      (libsource (lib stmbl) (part Led_Small))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5817A2F5))
     (comp (ref C136)
@@ -1644,7 +1644,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5824ACDB))
     (comp (ref C135)
@@ -1653,7 +1653,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5824C702))
     (comp (ref C134)
@@ -1662,7 +1662,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 58250581))
     (comp (ref R132)
@@ -1670,7 +1670,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 57D63C12))
     (comp (ref C132)
@@ -1679,7 +1679,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 582791CF))
     (comp (ref C131)
@@ -1688,7 +1688,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5828EFB0))
     (comp (ref C137)
@@ -1697,7 +1697,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5829DD53))
     (comp (ref C133)
@@ -1706,7 +1706,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5829DE03))
     (comp (ref VR1)
@@ -1716,7 +1716,7 @@
         (field (name "Manufacturer No") VA0805K121R014-ND)
         (field (name Voltage) " ")
         (field (name Source) " "))
-      (libsource (lib stmbl1) (part VR))
+      (libsource (lib stmbl) (part VR))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 582FC365))
     (comp (ref C62)
@@ -1725,7 +1725,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 583297B2))
     (comp (ref C139)
@@ -1734,7 +1734,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5832CFE2))
     (comp (ref C140)
@@ -1743,7 +1743,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5832D0A0))
     (comp (ref C142)
@@ -1752,14 +1752,14 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5833FCEB))
     (comp (ref JP6)
       (value JUMPER3_NC)
       (footprint stmbl:SOLDER_JUMPER_3_NC)
       (fields)
-      (libsource (lib stmbl1) (part JUMPER3_NC))
+      (libsource (lib stmbl) (part JUMPER3_NC))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5832AA58))
     (comp (ref C143)
@@ -1767,7 +1767,7 @@
       (footprint stmbl:C_Radial_D6.5_L11_P2.5)
       (fields
         (field (name Voltage) 50V))
-      (libsource (lib stmbl1) (part CP))
+      (libsource (lib stmbl) (part CP))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 584F61D7))
     (comp (ref R158)
@@ -1775,7 +1775,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5884D28E))
     (comp (ref R155)
@@ -1783,7 +1783,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5884FB7D))
     (comp (ref R156)
@@ -1791,7 +1791,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5884FC85))
     (comp (ref R157)
@@ -1799,7 +1799,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5884FD91))
     (comp (ref R154)
@@ -1807,7 +1807,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 588520BC))
     (comp (ref C144)
@@ -1816,7 +1816,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 58856551))
     (comp (ref R159)
@@ -1824,7 +1824,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5885E706))
     (comp (ref R160)
@@ -1832,7 +1832,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/supply/) (tstamps /56590966/56591916/))
       (tstamp 5885FDC7))
     (comp (ref U8)
@@ -1840,7 +1840,7 @@
       (footprint stmbl:SOIC-8-N)
       (fields
         (field (name "Manufacturer No") SN65176B))
-      (libsource (lib stmbl_4.0-rescue) (part SP3485EN-RESCUE-stmbl_4.0))
+      (libsource (lib stmbl) (part SP3485))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DD0E7))
     (comp (ref J3)
@@ -1849,7 +1849,7 @@
       (fields
         (field (name "Manufacturer No") AJT34L8813-011)
         (field (name Source) https://de.aliexpress.com/item/Free-shipping-50pcs-lot-RJ45-connector-RJ45-socket-with-indicators-Ethernet/539701403.html))
-      (libsource (lib stmbl1) (part RJ45_LED))
+      (libsource (lib stmbl) (part RJ45_LED))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DD759))
     (comp (ref R63)
@@ -1857,7 +1857,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DD7F2))
     (comp (ref C53)
@@ -1866,7 +1866,7 @@
       (fields
         (field (name Tolerance) X7R)
         (field (name Voltage) 50V))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DD843))
     (comp (ref U9)
@@ -1874,7 +1874,7 @@
       (footprint stmbl:SOIC-8-N)
       (fields
         (field (name "Manufacturer No") SN65176B))
-      (libsource (lib stmbl_4.0-rescue) (part SP3485EN-RESCUE-stmbl_4.0))
+      (libsource (lib stmbl) (part SP3485))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DDC9B))
     (comp (ref R66)
@@ -1882,7 +1882,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DDCA1))
     (comp (ref C54)
@@ -1891,7 +1891,7 @@
       (fields
         (field (name Tolerance) X7R)
         (field (name Voltage) 50V))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DDCA7))
     (comp (ref U10)
@@ -1899,7 +1899,7 @@
       (footprint stmbl:SOIC-8-N)
       (fields
         (field (name "Manufacturer No") SN65176B))
-      (libsource (lib stmbl_4.0-rescue) (part SP3485EN-RESCUE-stmbl_4.0))
+      (libsource (lib stmbl) (part SP3485))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DDF06))
     (comp (ref R69)
@@ -1907,7 +1907,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DDF0C))
     (comp (ref C55)
@@ -1916,7 +1916,7 @@
       (fields
         (field (name Tolerance) X7R)
         (field (name Voltage) 50V))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DDF12))
     (comp (ref U11)
@@ -1924,7 +1924,7 @@
       (footprint stmbl:SOIC-8-N)
       (fields
         (field (name "Manufacturer No") SN65176B))
-      (libsource (lib stmbl_4.0-rescue) (part SP3485EN-RESCUE-stmbl_4.0))
+      (libsource (lib stmbl) (part SP3485))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DDF3C))
     (comp (ref R72)
@@ -1932,7 +1932,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DDF42))
     (comp (ref C56)
@@ -1941,7 +1941,7 @@
       (fields
         (field (name Tolerance) X7R)
         (field (name Voltage) 50V))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DDF48))
     (comp (ref R31)
@@ -1949,7 +1949,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DE65E))
     (comp (ref C17)
@@ -1958,7 +1958,7 @@
       (fields
         (field (name Tolerance) X7R)
         (field (name Voltage) 50V))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DE6AE))
     (comp (ref R17)
@@ -1966,7 +1966,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DE7AD))
     (comp (ref R18)
@@ -1974,7 +1974,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 565DE83B))
     (comp (ref R62)
@@ -1982,7 +1982,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 56F9D4F8))
     (comp (ref R64)
@@ -1990,7 +1990,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 56F9D5CB))
     (comp (ref R65)
@@ -1998,7 +1998,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 56F9E212))
     (comp (ref R67)
@@ -2006,7 +2006,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 56F9E5E6))
     (comp (ref R68)
@@ -2014,7 +2014,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 56F9EA0F))
     (comp (ref R70)
@@ -2022,7 +2022,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 56F9EFAF))
     (comp (ref R71)
@@ -2030,7 +2030,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 56F9FEE2))
     (comp (ref R73)
@@ -2038,7 +2038,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 56F9FFE7))
     (comp (ref R101)
@@ -2046,7 +2046,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 57758B35))
     (comp (ref R102)
@@ -2054,7 +2054,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 57758F9B))
     (comp (ref R103)
@@ -2062,7 +2062,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 577591B1))
     (comp (ref R104)
@@ -2070,7 +2070,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 5775928B))
     (comp (ref L7)
@@ -2079,7 +2079,7 @@
       (fields
         (field (name "Manufacturer No") BLM18AG221SN1)
         (field (name Source) https://de.aliexpress.com/item/500-PCS-LOT-patch-magnetic-bead-FB-BLM18AG221SN1-0603-220-r-0-5-A-magnetic-beads/32675343247.html))
-      (libsource (lib stmbl1) (part INDUCTOR))
+      (libsource (lib stmbl) (part INDUCTOR))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 57AD7F96))
     (comp (ref C112)
@@ -2088,7 +2088,7 @@
       (fields
         (field (name Tolerance) X7R)
         (field (name Voltage) 50V))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 57AD80BE))
     (comp (ref P15)
@@ -2096,7 +2096,7 @@
       (footprint stmbl:akl182-2)
       (fields
         (field (name "Manufacturer No") "Phoenix 1844210"))
-      (libsource (lib stmbl1) (part CONN_01X02))
+      (libsource (lib stmbl) (part CONN_01X02))
       (sheetpath (names /ctrl/CMD/) (tstamps /56590966/56591919/))
       (tstamp 57B3D62F))
     (comp (ref U6)
@@ -2104,7 +2104,7 @@
       (footprint stmbl:SOIC-8-N)
       (fields
         (field (name "Manufacturer No") LM358AD))
-      (libsource (lib stmbl1) (part LM358))
+      (libsource (lib stmbl) (part LM358))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 5659192C))
     (comp (ref U14)
@@ -2112,7 +2112,7 @@
       (footprint stmbl:SOIC-8-N)
       (fields
         (field (name "Manufacturer No") SN65176B))
-      (libsource (lib stmbl_4.0-rescue) (part SP3485EN-RESCUE-stmbl_4.0))
+      (libsource (lib stmbl) (part SP3485))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565DFE81))
     (comp (ref J2)
@@ -2121,7 +2121,7 @@
       (fields
         (field (name "Manufacturer No") AJT34L8813-011)
         (field (name Source) https://de.aliexpress.com/item/Free-shipping-50pcs-lot-RJ45-connector-RJ45-socket-with-indicators-Ethernet/539701403.html))
-      (libsource (lib stmbl1) (part RJ45_LED))
+      (libsource (lib stmbl) (part RJ45_LED))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565DFE88))
     (comp (ref R109)
@@ -2129,7 +2129,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565DFE8F))
     (comp (ref C72)
@@ -2138,7 +2138,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565DFE96))
     (comp (ref U17)
@@ -2146,7 +2146,7 @@
       (footprint stmbl:SOIC-8-N)
       (fields
         (field (name "Manufacturer No") SN65176B))
-      (libsource (lib stmbl_4.0-rescue) (part SP3485EN-RESCUE-stmbl_4.0))
+      (libsource (lib stmbl) (part SP3485))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565DFEAC))
     (comp (ref R111)
@@ -2154,7 +2154,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565DFEB3))
     (comp (ref C74)
@@ -2163,7 +2163,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565DFEBA))
     (comp (ref U18)
@@ -2171,7 +2171,7 @@
       (footprint stmbl:SOIC-8-N)
       (fields
         (field (name "Manufacturer No") SN65176B))
-      (libsource (lib stmbl_4.0-rescue) (part SP3485EN-RESCUE-stmbl_4.0))
+      (libsource (lib stmbl) (part SP3485))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565DFED0))
     (comp (ref R114)
@@ -2179,7 +2179,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565DFED7))
     (comp (ref C75)
@@ -2188,7 +2188,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565DFEDE))
     (comp (ref R3)
@@ -2196,7 +2196,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565DFFA4))
     (comp (ref R6)
@@ -2204,7 +2204,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565DFFAB))
     (comp (ref R42)
@@ -2212,7 +2212,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E07F5))
     (comp (ref R44)
@@ -2220,7 +2220,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E0878))
     (comp (ref R47)
@@ -2228,7 +2228,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E0919))
     (comp (ref R55)
@@ -2236,7 +2236,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E098D))
     (comp (ref R86)
@@ -2244,7 +2244,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E236D))
     (comp (ref R93)
@@ -2252,7 +2252,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E23EB))
     (comp (ref C47)
@@ -2261,7 +2261,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E24CA))
     (comp (ref R36)
@@ -2269,7 +2269,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E2D07))
     (comp (ref R39)
@@ -2277,7 +2277,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E2D0D))
     (comp (ref R50)
@@ -2285,7 +2285,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E2D13))
     (comp (ref R56)
@@ -2293,7 +2293,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E2D19))
     (comp (ref R89)
@@ -2301,7 +2301,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E32C5))
     (comp (ref R95)
@@ -2309,7 +2309,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E32CB))
     (comp (ref C48)
@@ -2318,7 +2318,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E32D1))
     (comp (ref R24)
@@ -2326,7 +2326,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E3AE9))
     (comp (ref R25)
@@ -2334,7 +2334,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E3BA8))
     (comp (ref C13)
@@ -2343,7 +2343,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E3C38))
     (comp (ref C36)
@@ -2352,7 +2352,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E1292))
     (comp (ref C25)
@@ -2361,7 +2361,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565E18D1))
     (comp (ref C27)
@@ -2370,7 +2370,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 565FB16C))
     (comp (ref R123)
@@ -2378,7 +2378,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 57756B74))
     (comp (ref R125)
@@ -2386,7 +2386,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 57757310))
     (comp (ref R128)
@@ -2394,7 +2394,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 57757D9E))
     (comp (ref L8)
@@ -2403,7 +2403,7 @@
       (fields
         (field (name "Manufacturer No") BLM18AG221SN2)
         (field (name Source) https://de.aliexpress.com/item/500-PCS-LOT-patch-magnetic-bead-FB-BLM18AG221SN1-0603-220-r-0-5-A-magnetic-beads/32675343247.html))
-      (libsource (lib stmbl1) (part INDUCTOR))
+      (libsource (lib stmbl) (part INDUCTOR))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 57ADE969))
     (comp (ref C113)
@@ -2412,7 +2412,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 57ADFEE4))
     (comp (ref L9)
@@ -2421,7 +2421,7 @@
       (fields
         (field (name "Manufacturer No") BLM18AG221SN3)
         (field (name Source) https://de.aliexpress.com/item/500-PCS-LOT-patch-magnetic-bead-FB-BLM18AG221SN1-0603-220-r-0-5-A-magnetic-beads/32675343247.html))
-      (libsource (lib stmbl1) (part INDUCTOR))
+      (libsource (lib stmbl) (part INDUCTOR))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 57AE2C95))
     (comp (ref C115)
@@ -2430,7 +2430,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 57AE2C9D))
     (comp (ref R130)
@@ -2438,7 +2438,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 57B0307F))
     (comp (ref C114)
@@ -2447,7 +2447,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 57B0D6F6))
     (comp (ref R137)
@@ -2455,7 +2455,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 57D5E6AA))
     (comp (ref R135)
@@ -2463,7 +2463,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 57D5F156))
     (comp (ref R136)
@@ -2471,7 +2471,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 57D5F335))
     (comp (ref C125)
@@ -2480,7 +2480,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 57D74C8F))
     (comp (ref R147)
@@ -2488,14 +2488,14 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 5810D912))
     (comp (ref JP2)
       (value JUMPER3_NC)
       (footprint stmbl:SOLDER_JUMPER_3_NC)
       (fields)
-      (libsource (lib stmbl1) (part JUMPER3_NC))
+      (libsource (lib stmbl) (part JUMPER3_NC))
       (sheetpath (names /ctrl/FB0/) (tstamps /56590966/5659191C/))
       (tstamp 583384DA))
     (comp (ref U7)
@@ -2503,7 +2503,7 @@
       (footprint stmbl:SOIC-8-N)
       (fields
         (field (name "Manufacturer No") LM358AD))
-      (libsource (lib stmbl1) (part LM358))
+      (libsource (lib stmbl) (part LM358))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 5659192C))
     (comp (ref U15)
@@ -2511,7 +2511,7 @@
       (footprint stmbl:SOIC-8-N)
       (fields
         (field (name "Manufacturer No") SN65176B))
-      (libsource (lib stmbl_4.0-rescue) (part SP3485EN-RESCUE-stmbl_4.0))
+      (libsource (lib stmbl) (part SP3485))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565DFE81))
     (comp (ref J1)
@@ -2520,7 +2520,7 @@
       (fields
         (field (name "Manufacturer No") AJT34L8813-011)
         (field (name Source) https://de.aliexpress.com/item/Free-shipping-50pcs-lot-RJ45-connector-RJ45-socket-with-indicators-Ethernet/539701403.html))
-      (libsource (lib stmbl1) (part RJ45_LED))
+      (libsource (lib stmbl) (part RJ45_LED))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565DFE88))
     (comp (ref R110)
@@ -2528,7 +2528,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565DFE8F))
     (comp (ref C71)
@@ -2537,7 +2537,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565DFE96))
     (comp (ref U16)
@@ -2545,7 +2545,7 @@
       (footprint stmbl:SOIC-8-N)
       (fields
         (field (name "Manufacturer No") SN65176B))
-      (libsource (lib stmbl_4.0-rescue) (part SP3485EN-RESCUE-stmbl_4.0))
+      (libsource (lib stmbl) (part SP3485))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565DFEAC))
     (comp (ref R112)
@@ -2553,7 +2553,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565DFEB3))
     (comp (ref C73)
@@ -2562,7 +2562,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565DFEBA))
     (comp (ref U19)
@@ -2570,7 +2570,7 @@
       (footprint stmbl:SOIC-8-N)
       (fields
         (field (name "Manufacturer No") SN65176B))
-      (libsource (lib stmbl_4.0-rescue) (part SP3485EN-RESCUE-stmbl_4.0))
+      (libsource (lib stmbl) (part SP3485))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565DFED0))
     (comp (ref R113)
@@ -2578,7 +2578,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565DFED7))
     (comp (ref C76)
@@ -2587,7 +2587,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565DFEDE))
     (comp (ref R4)
@@ -2595,7 +2595,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565DFFA4))
     (comp (ref R5)
@@ -2603,7 +2603,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565DFFAB))
     (comp (ref R41)
@@ -2611,7 +2611,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E07F5))
     (comp (ref R43)
@@ -2619,7 +2619,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E0878))
     (comp (ref R48)
@@ -2627,7 +2627,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E0919))
     (comp (ref R54)
@@ -2635,7 +2635,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E098D))
     (comp (ref R87)
@@ -2643,7 +2643,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E236D))
     (comp (ref R94)
@@ -2651,7 +2651,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E23EB))
     (comp (ref C46)
@@ -2660,7 +2660,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E24CA))
     (comp (ref R37)
@@ -2668,7 +2668,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E2D07))
     (comp (ref R38)
@@ -2676,7 +2676,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E2D0D))
     (comp (ref R49)
@@ -2684,7 +2684,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E2D13))
     (comp (ref R57)
@@ -2692,7 +2692,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E2D19))
     (comp (ref R88)
@@ -2700,7 +2700,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E32C5))
     (comp (ref R96)
@@ -2708,7 +2708,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E32CB))
     (comp (ref C49)
@@ -2717,7 +2717,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E32D1))
     (comp (ref R23)
@@ -2725,7 +2725,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E3AE9))
     (comp (ref R26)
@@ -2733,7 +2733,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E3BA8))
     (comp (ref C12)
@@ -2742,7 +2742,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E3C38))
     (comp (ref C37)
@@ -2751,7 +2751,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E1292))
     (comp (ref C24)
@@ -2760,7 +2760,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565E18D1))
     (comp (ref C26)
@@ -2769,7 +2769,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 565FB16C))
     (comp (ref R124)
@@ -2777,7 +2777,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 57756B74))
     (comp (ref R126)
@@ -2785,7 +2785,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 57757310))
     (comp (ref R127)
@@ -2793,7 +2793,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 57757D9E))
     (comp (ref L10)
@@ -2802,7 +2802,7 @@
       (fields
         (field (name "Manufacturer No") BLM18AG221SN2)
         (field (name Source) https://de.aliexpress.com/item/500-PCS-LOT-patch-magnetic-bead-FB-BLM18AG221SN1-0603-220-r-0-5-A-magnetic-beads/32675343247.html))
-      (libsource (lib stmbl1) (part INDUCTOR))
+      (libsource (lib stmbl) (part INDUCTOR))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 57ADE969))
     (comp (ref C116)
@@ -2811,7 +2811,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 57ADFEE4))
     (comp (ref L11)
@@ -2820,7 +2820,7 @@
       (fields
         (field (name "Manufacturer No") BLM18AG221SN3)
         (field (name Source) https://de.aliexpress.com/item/500-PCS-LOT-patch-magnetic-bead-FB-BLM18AG221SN1-0603-220-r-0-5-A-magnetic-beads/32675343247.html))
-      (libsource (lib stmbl1) (part INDUCTOR))
+      (libsource (lib stmbl) (part INDUCTOR))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 57AE2C95))
     (comp (ref C118)
@@ -2829,7 +2829,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 57AE2C9D))
     (comp (ref R131)
@@ -2837,7 +2837,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 57B0307F))
     (comp (ref C117)
@@ -2846,7 +2846,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 57B0D6F6))
     (comp (ref R140)
@@ -2854,7 +2854,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 57D5E6AA))
     (comp (ref R138)
@@ -2862,7 +2862,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 57D5F156))
     (comp (ref R139)
@@ -2870,7 +2870,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 57D5F335))
     (comp (ref C126)
@@ -2879,7 +2879,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 57D74C8F))
     (comp (ref R148)
@@ -2887,14 +2887,14 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 5810D912))
     (comp (ref JP5)
       (value JUMPER3_NC)
       (footprint stmbl:SOLDER_JUMPER_3_NC)
       (fields)
-      (libsource (lib stmbl1) (part JUMPER3_NC))
+      (libsource (lib stmbl) (part JUMPER3_NC))
       (sheetpath (names /ctrl/FB1/) (tstamps /56590966/565F7162/))
       (tstamp 583384DA))
     (comp (ref P5)
@@ -2902,7 +2902,7 @@
       (footprint stmbl:akl182-6)
       (fields
         (field (name "Manufacturer No") "Phoenix 1844252"))
-      (libsource (lib stmbl1) (part CONN_01X06))
+      (libsource (lib stmbl) (part CONN_01X06))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 56602281))
     (comp (ref P9)
@@ -2910,7 +2910,7 @@
       (footprint stmbl:akl182-6)
       (fields
         (field (name "Manufacturer No") "Phoenix 1844252"))
-      (libsource (lib stmbl1) (part CONN_01X06))
+      (libsource (lib stmbl) (part CONN_01X06))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 56684699))
     (comp (ref Q1)
@@ -2918,7 +2918,7 @@
       (footprint stmbl:SOT-23)
       (fields
         (field (name "Manufacturer No") IRLML6344TRPBF))
-      (libsource (lib stmbl1) (part MMBF170))
+      (libsource (lib stmbl) (part MMBF170))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5700EA19))
     (comp (ref R9)
@@ -2926,7 +2926,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5700ECBA))
     (comp (ref R12)
@@ -2934,7 +2934,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5700F279))
     (comp (ref D2)
@@ -2942,7 +2942,7 @@
       (footprint stmbl:SMA_Standard)
       (fields
         (field (name "Manufacturer No") ES1J-LTP))
-      (libsource (lib stmbl1) (part D))
+      (libsource (lib stmbl) (part D))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5700FF9B))
     (comp (ref Q2)
@@ -2950,7 +2950,7 @@
       (footprint stmbl:SOT-23)
       (fields
         (field (name "Manufacturer No") IRLML6344TRPBF))
-      (libsource (lib stmbl1) (part MMBF170))
+      (libsource (lib stmbl) (part MMBF170))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 57011943))
     (comp (ref R10)
@@ -2958,7 +2958,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5701194A))
     (comp (ref R13)
@@ -2966,7 +2966,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 57011951))
     (comp (ref D3)
@@ -2974,7 +2974,7 @@
       (footprint stmbl:SMA_Standard)
       (fields
         (field (name "Manufacturer No") ES1J-LTP))
-      (libsource (lib stmbl1) (part D))
+      (libsource (lib stmbl) (part D))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 57011965))
     (comp (ref Q3)
@@ -2982,7 +2982,7 @@
       (footprint stmbl:SOT-23)
       (fields
         (field (name "Manufacturer No") IRLML6344TRPBF))
-      (libsource (lib stmbl1) (part MMBF170))
+      (libsource (lib stmbl) (part MMBF170))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 570122C9))
     (comp (ref R11)
@@ -2990,7 +2990,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 570122D0))
     (comp (ref R14)
@@ -2998,7 +2998,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 570122D7))
     (comp (ref D5)
@@ -3006,7 +3006,7 @@
       (footprint stmbl:SMA_Standard)
       (fields
         (field (name "Manufacturer No") ES1J-LTP))
-      (libsource (lib stmbl1) (part D))
+      (libsource (lib stmbl) (part D))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 570122EB))
     (comp (ref Q4)
@@ -3014,7 +3014,7 @@
       (footprint stmbl:SOT-23)
       (fields
         (field (name "Manufacturer No") IRLML6344TRPBF))
-      (libsource (lib stmbl1) (part MMBF170))
+      (libsource (lib stmbl) (part MMBF170))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 57014D91))
     (comp (ref R40)
@@ -3022,7 +3022,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 57014D98))
     (comp (ref R45)
@@ -3030,7 +3030,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 57014D9F))
     (comp (ref D7)
@@ -3038,7 +3038,7 @@
       (footprint stmbl:SMA_Standard)
       (fields
         (field (name "Manufacturer No") ES1J-LTP))
-      (libsource (lib stmbl1) (part D))
+      (libsource (lib stmbl) (part D))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 57014DB3))
     (comp (ref R119)
@@ -3046,7 +3046,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5777EC79))
     (comp (ref R106)
@@ -3054,7 +3054,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5777EC80))
     (comp (ref R108)
@@ -3062,7 +3062,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5777EC87))
     (comp (ref R105)
@@ -3070,7 +3070,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5777EC9C))
     (comp (ref R98)
@@ -3078,7 +3078,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5777ECA3))
     (comp (ref R99)
@@ -3086,7 +3086,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5777ECAA))
     (comp (ref C52)
@@ -3095,7 +3095,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5777ECBE))
     (comp (ref C59)
@@ -3104,7 +3104,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5777ECC5))
     (comp (ref P10)
@@ -3112,7 +3112,7 @@
       (footprint stmbl:Socket_Strip_Angled_2x06)
       (fields
         (field (name "Manufacturer No") "Molex 10894123"))
-      (libsource (lib stmbl1) (part CONN_02X06))
+      (libsource (lib stmbl) (part CONN_02X06))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5801B855))
     (comp (ref R20)
@@ -3120,7 +3120,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5802325E))
     (comp (ref D4)
@@ -3128,7 +3128,7 @@
       (footprint stmbl:LED-0805-SIDE)
       (fields
         (field (name "Manufacturer No") LTST-S220KGKT))
-      (libsource (lib stmbl1) (part Led_Small))
+      (libsource (lib stmbl) (part Led_Small))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 58023549))
     (comp (ref R22)
@@ -3136,7 +3136,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5802C477))
     (comp (ref D14)
@@ -3144,7 +3144,7 @@
       (footprint stmbl:LED-0805-SIDE)
       (fields
         (field (name "Manufacturer No") LTST-S220KGKT))
-      (libsource (lib stmbl1) (part Led_Small))
+      (libsource (lib stmbl) (part Led_Small))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5802C47E))
     (comp (ref R74)
@@ -3152,7 +3152,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5802D7FB))
     (comp (ref D15)
@@ -3160,7 +3160,7 @@
       (footprint stmbl:LED-0805-SIDE)
       (fields
         (field (name "Manufacturer No") LTST-S220KGKT))
-      (libsource (lib stmbl1) (part Led_Small))
+      (libsource (lib stmbl) (part Led_Small))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5802D802))
     (comp (ref R134)
@@ -3168,7 +3168,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5803293F))
     (comp (ref D20)
@@ -3176,7 +3176,7 @@
       (footprint stmbl:LED-0805-SIDE)
       (fields
         (field (name "Manufacturer No") LTST-S220KGKT))
-      (libsource (lib stmbl1) (part Led_Small))
+      (libsource (lib stmbl) (part Led_Small))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 58032946))
     (comp (ref R120)
@@ -3184,7 +3184,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 580345B1))
     (comp (ref D19)
@@ -3192,7 +3192,7 @@
       (footprint stmbl:LED-0805-SIDE)
       (fields
         (field (name "Manufacturer No") LTST-S220KGKT))
-      (libsource (lib stmbl1) (part Led_Small))
+      (libsource (lib stmbl) (part Led_Small))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 580345B7))
     (comp (ref R85)
@@ -3200,7 +3200,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 58042541))
     (comp (ref D18)
@@ -3208,7 +3208,7 @@
       (footprint stmbl:LED-0805-SIDE)
       (fields
         (field (name "Manufacturer No") LTST-S220KGKT))
-      (libsource (lib stmbl1) (part Led_Small))
+      (libsource (lib stmbl) (part Led_Small))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 58042548))
     (comp (ref R83)
@@ -3216,7 +3216,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 58042BA6))
     (comp (ref D17)
@@ -3224,7 +3224,7 @@
       (footprint stmbl:LED-0805-SIDE)
       (fields
         (field (name "Manufacturer No") LTST-S220KSKT))
-      (libsource (lib stmbl1) (part Led_Small))
+      (libsource (lib stmbl) (part Led_Small))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 58042BAD))
     (comp (ref R76)
@@ -3232,7 +3232,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 58044D37))
     (comp (ref D16)
@@ -3240,14 +3240,14 @@
       (footprint stmbl:LED-0805-SIDE)
       (fields
         (field (name "Manufacturer No") LTST-S220KRKT))
-      (libsource (lib stmbl1) (part Led_Small))
+      (libsource (lib stmbl) (part Led_Small))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 58044D3E))
     (comp (ref P4)
       (value CONN_01X02)
       (footprint stmbl:Pin_Header_Angled_1x02)
       (fields)
-      (libsource (lib stmbl1) (part CONN_01X02))
+      (libsource (lib stmbl) (part CONN_01X02))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 5819E5C6))
     (comp (ref C91)
@@ -3256,7 +3256,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 581C11FC))
     (comp (ref C94)
@@ -3265,7 +3265,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 581C2D8E))
     (comp (ref C95)
@@ -3274,7 +3274,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 581C4843))
     (comp (ref C100)
@@ -3283,7 +3283,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 581C6D7F))
     (comp (ref C130)
@@ -3292,7 +3292,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 581C6F9A))
     (comp (ref C98)
@@ -3301,14 +3301,14 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 581CA574))
     (comp (ref JP3)
       (value JUMPER3_NC)
       (footprint stmbl:SOLDER_JUMPER_3_NC)
       (fields)
-      (libsource (lib stmbl1) (part JUMPER3_NC))
+      (libsource (lib stmbl) (part JUMPER3_NC))
       (sheetpath (names /ctrl/IO/) (tstamps /56590966/56591923/))
       (tstamp 58336753))
     (comp (ref U26)
@@ -3316,7 +3316,7 @@
       (footprint stmbl:LQFP-100_14x14mm_Pitch0.5mm)
       (fields
         (field (name "Manufacturer No") STM32F405VGT))
-      (libsource (lib stmbl1) (part STM32F405VG))
+      (libsource (lib stmbl) (part STM32F405VG))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FD974))
     (comp (ref Y2)
@@ -3325,7 +3325,7 @@
       (fields
         (field (name "Manufacturer No") ABM3B-8.000MHZ-10-1UT)
         (field (name Source) https://de.aliexpress.com/item/1LOT-10PCS-Crystal-8MHZ-20PF-20PPM-4P-5032-SeriesYSX531SL/32534814045.html))
-      (libsource (lib stmbl1) (part Crystal))
+      (libsource (lib stmbl) (part Crystal))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FDF0A))
     (comp (ref C31)
@@ -3334,7 +3334,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FDF4E))
     (comp (ref C32)
@@ -3343,7 +3343,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FDFAD))
     (comp (ref C90)
@@ -3352,7 +3352,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FE1E0))
     (comp (ref C88)
@@ -3361,7 +3361,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FE20A))
     (comp (ref C89)
@@ -3370,7 +3370,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FE528))
     (comp (ref C87)
@@ -3379,7 +3379,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FE6F4))
     (comp (ref C86)
@@ -3388,7 +3388,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FE720))
     (comp (ref C85)
@@ -3397,7 +3397,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FE74C))
     (comp (ref C84)
@@ -3406,7 +3406,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FE77A))
     (comp (ref C80)
@@ -3415,7 +3415,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FE7A9))
     (comp (ref C77)
@@ -3424,7 +3424,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FE7DB))
     (comp (ref C65)
@@ -3433,7 +3433,7 @@
       (fields
         (field (name Voltage) 25V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FE80F))
     (comp (ref L3)
@@ -3442,7 +3442,7 @@
       (fields
         (field (name "Manufacturer No") BLM18AG221SN1)
         (field (name Source) https://de.aliexpress.com/item/500-PCS-LOT-patch-magnetic-bead-FB-BLM18AG221SN1-0603-220-r-0-5-A-magnetic-beads/32675343247.html))
-      (libsource (lib stmbl1) (part INDUCTOR))
+      (libsource (lib stmbl) (part INDUCTOR))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FF296))
     (comp (ref C29)
@@ -3451,7 +3451,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 565FFAD0))
     (comp (ref P1)
@@ -3460,7 +3460,7 @@
       (fields
         (field (name "Manufacturer No") 105017-0001)
         (field (name Source) https://de.aliexpress.com/item/Wholesale-100Pcs-lot-5-Pins-Micro-USB-SMD-Female-USB-PCB-Connector-Socket-USB-Jack-Plug/1840320498.html))
-      (libsource (lib stmbl1) (part USB_OTG))
+      (libsource (lib stmbl) (part USB_OTG))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 56602983))
     (comp (ref U1)
@@ -3468,7 +3468,7 @@
       (footprint stmbl:SOT-23-6)
       (fields
         (field (name "Manufacturer No") USBLC6-4SC6))
-      (libsource (lib stmbl1) (part USBLC6-4SC6))
+      (libsource (lib stmbl) (part USBLC6-4SC6))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 5667D8FF))
     (comp (ref R116)
@@ -3476,7 +3476,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 5668EA86))
     (comp (ref R117)
@@ -3484,7 +3484,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 5668EAFB))
     (comp (ref R121)
@@ -3492,7 +3492,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 5668F2EF))
     (comp (ref R122)
@@ -3500,7 +3500,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 5668F395))
     (comp (ref C81)
@@ -3509,7 +3509,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 56692CBC))
     (comp (ref C64)
@@ -3518,7 +3518,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 56693D94))
     (comp (ref R61)
@@ -3526,14 +3526,14 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 566A9C27))
     (comp (ref JP9)
       (value Jumper_NO_Small)
       (footprint stmbl:SOLDER_JUMPER)
       (fields)
-      (libsource (lib stmbl1) (part Jumper_NO_Small))
+      (libsource (lib stmbl) (part Jumper_NO_Small))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 566A9E2C))
     (comp (ref C16)
@@ -3542,7 +3542,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 5666869C))
     (comp (ref C119)
@@ -3551,7 +3551,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 57B075E7))
     (comp (ref C1)
@@ -3560,7 +3560,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 56602D8C))
     (comp (ref R1)
@@ -3568,7 +3568,7 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 56602DEB))
     (comp (ref U23)
@@ -3576,7 +3576,7 @@
       (footprint stmbl:SOT-23-6)
       (fields
         (field (name "Manufacturer No") USBLC6-4SC6))
-      (libsource (lib stmbl1) (part USBLC6-4SC6))
+      (libsource (lib stmbl) (part USBLC6-4SC6))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 5818ACD1))
     (comp (ref U20)
@@ -3584,7 +3584,7 @@
       (footprint stmbl:SOT-23-6)
       (fields
         (field (name "Manufacturer No") USBLC6-4SC6))
-      (libsource (lib stmbl1) (part USBLC6-4SC6))
+      (libsource (lib stmbl) (part USBLC6-4SC6))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 5818ACD9))
     (comp (ref U22)
@@ -3592,7 +3592,7 @@
       (footprint stmbl:SOT-23-6)
       (fields
         (field (name "Manufacturer No") USBLC6-4SC6))
-      (libsource (lib stmbl1) (part USBLC6-4SC6))
+      (libsource (lib stmbl) (part USBLC6-4SC6))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 5818ACE1))
     (comp (ref C61)
@@ -3601,7 +3601,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 5818ACE8))
     (comp (ref C66)
@@ -3610,7 +3610,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 5818ACEF))
     (comp (ref C67)
@@ -3619,7 +3619,7 @@
       (fields
         (field (name Voltage) 50V)
         (field (name Tolerance) X7R))
-      (libsource (lib stmbl1) (part C))
+      (libsource (lib stmbl) (part C))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 5818ACF6))
     (comp (ref R153)
@@ -3627,11 +3627,11 @@
       (footprint stmbl:R_0603)
       (fields
         (field (name Tolerance) 1%))
-      (libsource (lib stmbl1) (part R))
+      (libsource (lib stmbl) (part R))
       (sheetpath (names /ctrl/f4/) (tstamps /56590966/56591913/))
       (tstamp 582C978B)))
   (libparts
-    (libpart (lib stmbl1) (part ACT4088)
+    (libpart (lib stmbl) (part ACT4088)
       (fields
         (field (name Reference) U)
         (field (name Value) ACT4088))
@@ -3642,7 +3642,7 @@
         (pin (num 4) (name FB) (type input))
         (pin (num 5) (name GND) (type power_in))
         (pin (num 6) (name BST) (type power_in))))
-    (libpart (lib stmbl1) (part C)
+    (libpart (lib stmbl) (part C)
       (footprints
         (fp C?)
         (fp C_????_*)
@@ -3655,7 +3655,7 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib stmbl1) (part CONN_01X02)
+    (libpart (lib stmbl) (part CONN_01X02)
       (footprints
         (fp Pin_Header_Straight_1X02)
         (fp Pin_Header_Angled_1X02)
@@ -3667,7 +3667,7 @@
       (pins
         (pin (num 1) (name P1) (type passive))
         (pin (num 2) (name P2) (type passive))))
-    (libpart (lib stmbl1) (part CONN_01X03)
+    (libpart (lib stmbl) (part CONN_01X03)
       (footprints
         (fp Pin_Header_Straight_1X03)
         (fp Pin_Header_Angled_1X03)
@@ -3680,7 +3680,7 @@
         (pin (num 1) (name P1) (type passive))
         (pin (num 2) (name P2) (type passive))
         (pin (num 3) (name P3) (type passive))))
-    (libpart (lib stmbl1) (part CONN_01X04)
+    (libpart (lib stmbl) (part CONN_01X04)
       (footprints
         (fp Pin_Header_Straight_1X04)
         (fp Pin_Header_Angled_1X04)
@@ -3694,7 +3694,7 @@
         (pin (num 2) (name P2) (type passive))
         (pin (num 3) (name P3) (type passive))
         (pin (num 4) (name P4) (type passive))))
-    (libpart (lib stmbl1) (part CONN_01X06)
+    (libpart (lib stmbl) (part CONN_01X06)
       (footprints
         (fp Pin_Header_Straight_1X06)
         (fp Pin_Header_Angled_1X06)
@@ -3710,7 +3710,7 @@
         (pin (num 4) (name P4) (type passive))
         (pin (num 5) (name P5) (type passive))
         (pin (num 6) (name P6) (type passive))))
-    (libpart (lib stmbl1) (part CONN_02X06)
+    (libpart (lib stmbl) (part CONN_02X06)
       (footprints
         (fp Pin_Header_Straight_2X06)
         (fp Pin_Header_Angled_2X06)
@@ -3732,7 +3732,7 @@
         (pin (num 10) (name P10) (type passive))
         (pin (num 11) (name P11) (type passive))
         (pin (num 12) (name P12) (type passive))))
-    (libpart (lib stmbl1) (part CP)
+    (libpart (lib stmbl) (part CP)
       (footprints
         (fp CP*)
         (fp Elko*)
@@ -3746,7 +3746,7 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib stmbl1) (part Crystal)
+    (libpart (lib stmbl) (part Crystal)
       (footprints
         (fp Crystal_*))
       (fields
@@ -3755,7 +3755,7 @@
       (pins
         (pin (num 1) (name 1) (type passive))
         (pin (num 2) (name 2) (type passive))))
-    (libpart (lib stmbl1) (part D)
+    (libpart (lib stmbl) (part D)
       (footprints
         (fp Diode_*)
         (fp D-Pak_TO252AA)
@@ -3768,7 +3768,7 @@
       (pins
         (pin (num 1) (name K) (type passive))
         (pin (num 2) (name A) (type passive))))
-    (libpart (lib stmbl1) (part D_Schottky)
+    (libpart (lib stmbl) (part D_Schottky)
       (footprints
         (fp D-Pak_TO252AA)
         (fp Diode_*)
@@ -3781,14 +3781,14 @@
       (pins
         (pin (num 1) (name K) (type passive))
         (pin (num 2) (name A) (type passive))))
-    (libpart (lib stmbl1) (part INDUCTOR)
+    (libpart (lib stmbl) (part INDUCTOR)
       (fields
         (field (name Reference) L)
         (field (name Value) INDUCTOR))
       (pins
         (pin (num 1) (name 1) (type passive))
         (pin (num 2) (name 2) (type passive))))
-    (libpart (lib stmbl1) (part IRAM256a)
+    (libpart (lib stmbl) (part IRAM256a)
       (fields
         (field (name Reference) U)
         (field (name Value) IRAM256a))
@@ -3814,7 +3814,7 @@
         (pin (num 27) (name VTH) (type output))
         (pin (num 28) (name VCC) (type power_in))
         (pin (num 29) (name GND) (type power_in))))
-    (libpart (lib stmbl1) (part JUMPER3_NC)
+    (libpart (lib stmbl) (part JUMPER3_NC)
       (fields
         (field (name Reference) JP)
         (field (name Value) JUMPER3_NC))
@@ -3822,14 +3822,14 @@
         (pin (num 1) (name 1) (type passive))
         (pin (num 2) (name 2) (type passive))
         (pin (num 3) (name 3) (type passive))))
-    (libpart (lib stmbl1) (part Jumper_NO_Small)
+    (libpart (lib stmbl) (part Jumper_NO_Small)
       (fields
         (field (name Reference) JP)
         (field (name Value) Jumper_NO_Small))
       (pins
         (pin (num 1) (name 1) (type passive))
         (pin (num 2) (name 2) (type passive))))
-    (libpart (lib stmbl1) (part LED)
+    (libpart (lib stmbl) (part LED)
       (footprints
         (fp LED-3MM)
         (fp LED-5MM)
@@ -3844,7 +3844,7 @@
       (pins
         (pin (num 1) (name K) (type passive))
         (pin (num 2) (name A) (type passive))))
-    (libpart (lib stmbl1) (part LM358)
+    (libpart (lib stmbl) (part LM358)
       (aliases
         (alias LMC6062)
         (alias LMC6082)
@@ -3863,7 +3863,7 @@
         (pin (num 6) (name -) (type input))
         (pin (num 7) (name ~) (type output))
         (pin (num 8) (name V+) (type power_in))))
-    (libpart (lib stmbl1) (part Led_Small)
+    (libpart (lib stmbl) (part Led_Small)
       (footprints
         (fp CP*)
         (fp SM*))
@@ -3873,7 +3873,7 @@
       (pins
         (pin (num 1) (name K) (type passive))
         (pin (num 2) (name A) (type passive))))
-    (libpart (lib stmbl1) (part MMBF170)
+    (libpart (lib stmbl) (part MMBF170)
       (footprints
         (fp SOT-23*))
       (fields
@@ -3884,11 +3884,11 @@
         (pin (num 1) (name G) (type input))
         (pin (num 2) (name S) (type passive))
         (pin (num 3) (name D) (type passive))))
-    (libpart (lib stmbl1) (part OPEN_HARDWARE_1)
+    (libpart (lib stmbl) (part OPEN_HARDWARE_1)
       (fields
         (field (name Reference) LOGO)
         (field (name Value) OPEN_HARDWARE_1)))
-    (libpart (lib stmbl1) (part R)
+    (libpart (lib stmbl) (part R)
       (footprints
         (fp R_*)
         (fp Resistor_*))
@@ -3898,7 +3898,7 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib stmbl1) (part RJ45_LED)
+    (libpart (lib stmbl) (part RJ45_LED)
       (footprints
         (fp RJ45*))
       (fields
@@ -3918,7 +3918,7 @@
         (pin (num 11) (name ~) (type passive))
         (pin (num 12) (name ~) (type passive))
         (pin (num 13) (name ~) (type passive))))
-    (libpart (lib stmbl1) (part SI8621)
+    (libpart (lib stmbl) (part SI8621)
       (fields
         (field (name Reference) U)
         (field (name Value) SI8621))
@@ -3931,12 +3931,12 @@
         (pin (num 6) (name B2) (type input))
         (pin (num 7) (name B1) (type output))
         (pin (num 8) (name VDD2) (type power_in))))
-    (libpart (lib stmbl_4.0-rescue) (part SP3485EN-RESCUE-stmbl_4.0)
+    (libpart (lib stmbl) (part SP3485)
       (footprints
         (fp SO8*))
       (fields
         (field (name Reference) U)
-        (field (name Value) SP3485EN-RESCUE-stmbl_4.0)
+        (field (name Value) SP3485)
         (field (name Footprint) SO-8))
       (pins
         (pin (num 1) (name RO) (type output))
@@ -3947,61 +3947,63 @@
         (pin (num 6) (name A) (type BiDi))
         (pin (num 7) (name B) (type BiDi))
         (pin (num 8) (name VCC) (type power_in))))
-    (libpart (lib stmbl_4.0-rescue) (part STM32F303CBTx-RESCUE-stmbl_4.0)
+    (libpart (lib stmbl) (part STM32F303CBTx)
+      (aliases
+        (alias STM32F303CCTx))
       (fields
         (field (name Reference) U)
-        (field (name Value) STM32F303CBTx-RESCUE-stmbl_4.0)
+        (field (name Value) STM32F303CBTx)
         (field (name Footprint) LQFP48))
       (pins
         (pin (num 1) (name VBAT) (type power_in))
-        (pin (num 2) (name PC13/RTC_OUT_ALARM/RTC_OUT_CALIB/RTC_TAMP1/RTC_TS/SYS_WKUP2/TIM1_CH1N) (type BiDi))
-        (pin (num 3) (name PC14/RCC_OSC32_IN) (type BiDi))
-        (pin (num 4) (name PC15/ADC1_EXTI15/ADC2_EXTI15/RCC_OSC32_OUT) (type BiDi))
-        (pin (num 5) (name PF0/I2C2_SDA/RCC_OSC_IN/TIM1_CH3N) (type input))
-        (pin (num 6) (name PF1/I2C2_SCL/RCC_OSC_OUT) (type input))
+        (pin (num 2) (name PC13) (type BiDi))
+        (pin (num 3) (name PC14) (type BiDi))
+        (pin (num 4) (name PC15) (type BiDi))
+        (pin (num 5) (name PF0) (type input))
+        (pin (num 6) (name PF1) (type input))
         (pin (num 7) (name NRST) (type input))
         (pin (num 8) (name VSSA) (type power_in))
         (pin (num 9) (name VDDA) (type power_in))
-        (pin (num 10) (name ADC1_IN1/COMP1_INM/COMP1_OUT/COMP7_INP/RTC_TAMP2/SYS_WKUP1/TIM2_CH1/TIM2_ETR/TIM8_BKIN/TIM8_ETR/TSC_G1_IO1/USART2_CTS/PA0) (type BiDi))
-        (pin (num 11) (name ADC1_IN2/COMP1_INP/OPAMP1_VINP/OPAMP1_VINP_SEC/OPAMP3_VINP/OPAMP3_VINP_SEC/RTC_REFIN/TIM15_CH1N/TIM2_CH2/TSC_G1_IO2/USART2_DE/USART2_RTS/PA1) (type BiDi))
-        (pin (num 12) (name ADC1_IN3/ADC3_EXTI2/ADC4_EXTI2/COMP2_INM/COMP2_OUT/OPAMP1_VOUT/TIM15_CH1/TIM2_CH3/TSC_G1_IO3/USART2_TX/PA2) (type BiDi))
-        (pin (num 13) (name ADC1_IN4/COMP2_INP/OPAMP1_VINM/OPAMP1_VINM_SEC/OPAMP1_VINP/OPAMP1_VINP_SEC/TIM15_CH2/TIM2_CH4/TSC_G1_IO4/USART2_RX/PA3) (type BiDi))
-        (pin (num 14) (name ADC2_IN1/COMP1_INM/COMP2_INM/COMP3_INM/COMP4_INM/COMP5_INM/COMP6_INM/COMP7_INM/DAC_OUT1/I2S3_WS/OPAMP4_VINP/OPAMP4_VINP_SEC/SPI1_NSS/SPI3_NSS/TIM3_CH2/TSC_G2_IO1/USART2_CK/PA4) (type BiDi))
-        (pin (num 15) (name ADC2_IN2/COMP1_INM/COMP2_INM/COMP3_INM/COMP4_INM/COMP5_INM/COMP6_INM/COMP7_INM/DAC_OUT2/OPAMP1_VINP/OPAMP1_VINP_SEC/OPAMP2_VINM/OPAMP2_VINM_SEC/OPAMP3_VINP/OPAMP3_VINP_SEC/SPI1_SCK/TIM2_CH1/TIM2_ETR/TSC_G2_IO2/PA5) (type BiDi))
-        (pin (num 16) (name ADC2_IN3/COMP1_OUT/OPAMP2_VOUT/SPI1_MISO/TIM16_CH1/TIM1_BKIN/TIM3_CH1/TIM8_BKIN/TSC_G2_IO3/PA6) (type BiDi))
-        (pin (num 17) (name ADC2_IN4/COMP2_INP/COMP2_OUT/OPAMP1_VINP/OPAMP1_VINP_SEC/OPAMP2_VINP/OPAMP2_VINP_SEC/SPI1_MOSI/TIM17_CH1/TIM1_CH1N/TIM3_CH2/TIM8_CH1N/TSC_G2_IO4/PA7) (type BiDi))
-        (pin (num 18) (name PB0/ADC3_IN12/COMP4_INP/OPAMP2_VINP/OPAMP2_VINP_SEC/OPAMP3_VINP/OPAMP3_VINP_SEC/TIM1_CH2N/TIM3_CH3/TIM8_CH2N/TSC_G3_IO2) (type BiDi))
-        (pin (num 19) (name PB1/ADC3_IN1/COMP4_OUT/OPAMP3_VOUT/TIM1_CH3N/TIM3_CH4/TIM8_CH3N/TSC_G3_IO3) (type BiDi))
-        (pin (num 20) (name PB2/ADC2_IN12/ADC3_EXTI2/ADC4_EXTI2/COMP4_INM/OPAMP3_VINM/OPAMP3_VINM_SEC/TSC_G3_IO4) (type BiDi))
-        (pin (num 21) (name PB10/COMP5_INM/OPAMP3_VINM/OPAMP3_VINM_SEC/OPAMP4_VINM/OPAMP4_VINM_SEC/TIM2_CH3/TSC_SYNC/USART3_TX) (type BiDi))
-        (pin (num 22) (name PB11/ADC1_EXTI11/ADC2_EXTI11/COMP6_INP/OPAMP4_VINP/OPAMP4_VINP_SEC/TIM2_CH4/TSC_G6_IO1/USART3_RX) (type BiDi))
+        (pin (num 10) (name PA0) (type BiDi))
+        (pin (num 11) (name PA1) (type BiDi))
+        (pin (num 12) (name PA2) (type BiDi))
+        (pin (num 13) (name PA3) (type BiDi))
+        (pin (num 14) (name PA4) (type BiDi))
+        (pin (num 15) (name PA5) (type BiDi))
+        (pin (num 16) (name PA6) (type BiDi))
+        (pin (num 17) (name PA7) (type BiDi))
+        (pin (num 18) (name PB0) (type BiDi))
+        (pin (num 19) (name PB1) (type BiDi))
+        (pin (num 20) (name PB2) (type BiDi))
+        (pin (num 21) (name PB10) (type BiDi))
+        (pin (num 22) (name PB11) (type BiDi))
         (pin (num 23) (name VSS) (type power_in))
         (pin (num 24) (name VDD) (type power_in))
-        (pin (num 25) (name PB12/ADC4_IN3/COMP3_INM/I2C2_SMBA/I2S2_WS/OPAMP4_VOUT/SPI2_NSS/TIM1_BKIN/TSC_G6_IO2/USART3_CK) (type BiDi))
-        (pin (num 26) (name PB13/ADC3_IN5/COMP5_INP/I2S2_CK/OPAMP3_VINP/OPAMP3_VINP_SEC/OPAMP4_VINP/OPAMP4_VINP_SEC/SPI2_SCK/TIM1_CH1N/TSC_G6_IO3/USART3_CTS) (type BiDi))
-        (pin (num 27) (name PB14/ADC4_IN4/COMP3_INP/I2S2_ext_SD/OPAMP2_VINP/OPAMP2_VINP_SEC/SPI2_MISO/TIM15_CH1/TIM1_CH2N/TSC_G6_IO4/USART3_DE/USART3_RTS) (type BiDi))
-        (pin (num 28) (name PB15/ADC1_EXTI15/ADC2_EXTI15/ADC4_IN5/COMP6_INM/I2S2_SD/RTC_REFIN/SPI2_MOSI/TIM15_CH1N/TIM15_CH2/TIM1_CH3N) (type BiDi))
-        (pin (num 29) (name COMP3_OUT/I2C2_SMBA/I2S2_MCK/RCC_MCO/TIM1_CH1/TIM4_ETR/USART1_CK/PA8) (type BiDi))
-        (pin (num 30) (name COMP5_OUT/DAC_EXTI9/I2C2_SCL/I2S3_MCK/TIM15_BKIN/TIM1_CH2/TIM2_CH3/TSC_G4_IO1/USART1_TX/PA9) (type BiDi))
-        (pin (num 31) (name COMP6_OUT/I2C2_SDA/TIM17_BKIN/TIM1_CH3/TIM2_CH4/TIM8_BKIN/TSC_G4_IO2/USART1_RX/PA10) (type BiDi))
-        (pin (num 32) (name ADC1_EXTI11/ADC2_EXTI11/CAN_RX/COMP1_OUT/TIM1_BKIN2/TIM1_CH1N/TIM1_CH4/TIM4_CH1/USART1_CTS/USB_DM/PA11) (type BiDi))
-        (pin (num 33) (name CAN_TX/COMP2_OUT/TIM16_CH1/TIM1_CH2N/TIM1_ETR/TIM4_CH2/USART1_DE/USART1_RTS/USB_DP/PA12) (type BiDi))
-        (pin (num 34) (name IR_OUT/SYS_JTMS-SWDIO/TIM16_CH1N/TIM4_CH3/TSC_G4_IO3/USART3_CTS/PA13) (type BiDi))
+        (pin (num 25) (name PB12) (type BiDi))
+        (pin (num 26) (name PB13) (type BiDi))
+        (pin (num 27) (name PB14) (type BiDi))
+        (pin (num 28) (name PB15) (type BiDi))
+        (pin (num 29) (name PA8) (type BiDi))
+        (pin (num 30) (name PA9) (type BiDi))
+        (pin (num 31) (name PA10) (type BiDi))
+        (pin (num 32) (name PA11) (type BiDi))
+        (pin (num 33) (name PA12) (type BiDi))
+        (pin (num 34) (name PA13) (type BiDi))
         (pin (num 35) (name VSS) (type power_in))
         (pin (num 36) (name VDD) (type power_in))
-        (pin (num 37) (name I2C1_SDA/SYS_JTCK-SWCLK/TIM1_BKIN/TIM8_CH2/TSC_G4_IO4/USART2_TX/PA14) (type BiDi))
-        (pin (num 38) (name ADC1_EXTI15/ADC2_EXTI15/I2C1_SCL/I2S3_WS/SPI1_NSS/SPI3_NSS/SYS_JTDI/TIM1_BKIN/TIM2_CH1/TIM2_ETR/TIM8_CH1/USART2_RX/PA15) (type BiDi))
-        (pin (num 39) (name PB3/I2S3_CK/SPI1_SCK/SPI3_SCK/SYS_JTDO-TRACESWO/TIM2_CH2/TIM3_ETR/TIM4_ETR/TIM8_CH1N/TSC_G5_IO1/USART2_TX) (type BiDi))
-        (pin (num 40) (name PB4/I2S3_ext_SD/SPI1_MISO/SPI3_MISO/SYS_NJTRST/TIM16_CH1/TIM17_BKIN/TIM3_CH1/TIM8_CH2N/TSC_G5_IO2/USART2_RX) (type BiDi))
-        (pin (num 41) (name PB5/I2C1_SMBA/I2S3_SD/SPI1_MOSI/SPI3_MOSI/TIM16_BKIN/TIM17_CH1/TIM3_CH2/TIM8_CH3N/USART2_CK) (type BiDi))
-        (pin (num 42) (name PB6/I2C1_SCL/TIM16_CH1N/TIM4_CH1/TIM8_BKIN2/TIM8_CH1/TIM8_ETR/TSC_G5_IO3/USART1_TX) (type BiDi))
-        (pin (num 43) (name PB7/I2C1_SDA/TIM17_CH1N/TIM3_CH4/TIM4_CH2/TIM8_BKIN/TSC_G5_IO4/USART1_RX) (type BiDi))
+        (pin (num 37) (name PA14) (type BiDi))
+        (pin (num 38) (name PA15) (type BiDi))
+        (pin (num 39) (name PB3) (type BiDi))
+        (pin (num 40) (name PB4) (type BiDi))
+        (pin (num 41) (name PB5) (type BiDi))
+        (pin (num 42) (name PB6) (type BiDi))
+        (pin (num 43) (name PB7) (type BiDi))
         (pin (num 44) (name BOOT0) (type input))
-        (pin (num 45) (name PB8/CAN_RX/COMP1_OUT/I2C1_SCL/TIM16_CH1/TIM1_BKIN/TIM4_CH3/TIM8_CH2/TSC_SYNC) (type BiDi))
-        (pin (num 46) (name PB9/CAN_TX/COMP2_OUT/DAC_EXTI9/I2C1_SDA/IR_OUT/TIM17_CH1/TIM4_CH4/TIM8_CH3) (type BiDi))
+        (pin (num 45) (name PB8) (type BiDi))
+        (pin (num 46) (name PB9) (type BiDi))
         (pin (num 47) (name VSS) (type power_in))
         (pin (num 48) (name VDD) (type power_in))))
-    (libpart (lib stmbl1) (part STM32F405VG)
+    (libpart (lib stmbl) (part STM32F405VG)
       (fields
         (field (name Reference) U)
         (field (name Value) STM32F405VG)
@@ -4107,7 +4109,7 @@
         (pin (num 98) (name PE1/FSMC_NBL1/EVENTOUT) (type input))
         (pin (num 99) (name VSS) (type input))
         (pin (num 100) (name VDD) (type input))))
-    (libpart (lib stmbl1) (part USBLC6-4SC6)
+    (libpart (lib stmbl) (part USBLC6-4SC6)
       (fields
         (field (name Reference) U)
         (field (name Value) USBLC6-4SC6)
@@ -4119,7 +4121,7 @@
         (pin (num 4) (name I/O3) (type unspc))
         (pin (num 5) (name VBUS) (type unspc))
         (pin (num 6) (name I/O4) (type unspc))))
-    (libpart (lib stmbl1) (part USB_OTG)
+    (libpart (lib stmbl) (part USB_OTG)
       (footprints
         (fp USB*))
       (fields
@@ -4132,14 +4134,14 @@
         (pin (num 4) (name ID) (type power_in))
         (pin (num 5) (name GND) (type power_in))
         (pin (num 6) (name shield) (type passive))))
-    (libpart (lib stmbl1) (part VR)
+    (libpart (lib stmbl) (part VR)
       (fields
         (field (name Reference) VR)
         (field (name Value) VR))
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
-    (libpart (lib stmbl1) (part lnk304D)
+    (libpart (lib stmbl) (part lnk304D)
       (fields
         (field (name Reference) U)
         (field (name Value) lnk304D))
@@ -4151,19 +4153,19 @@
         (pin (num 6) (name S) (type power_out))
         (pin (num 7) (name S) (type power_out))
         (pin (num 8) (name S) (type power_out))))
-    (libpart (lib stmbl1) (part non_plated)
+    (libpart (lib stmbl) (part non_plated)
       (footprints
         (fp non_plated_3mm))
       (fields
         (field (name Reference) U)
         (field (name Value) non_plated)))
-    (libpart (lib stmbl1) (part testpoint)
+    (libpart (lib stmbl) (part testpoint)
       (fields
         (field (name Reference) T)
         (field (name Value) testpoint))
       (pins
         (pin (num 1) (name ~) (type BiDi))))
-    (libpart (lib stmbl1) (part zldo1117)
+    (libpart (lib stmbl) (part zldo1117)
       (fields
         (field (name Reference) U)
         (field (name Value) zldo1117))
@@ -4172,10 +4174,8 @@
         (pin (num 2) (name VO) (type power_out))
         (pin (num 3) (name VI) (type input)))))
   (libraries
-    (library (logical stmbl1)
-      (uri /Users/crinq/sandbox/stmbl2/hw/kicad/lib/stmbl.lib))
-    (library (logical stmbl_4.0-rescue)
-      (uri /Users/crinq/sandbox/stmbl2/hw/kicad/v4.0/stmbl_4.0-rescue.lib)))
+    (library (logical stmbl)
+      (uri /Users/crinq/sandbox/stmbl2/hw/kicad/v4.0/../lib/stmbl.lib)))
   (nets
     (net (code 1) (name /ctrl/TX)
       (node (ref P14) (pin 3))
@@ -4220,8 +4220,8 @@
       (node (ref R33) (pin 2)))
     (net (code 10) (name /hv/f3/A_HV)
       (node (ref R78) (pin 2))
-      (node (ref C39) (pin 1))
       (node (ref U25) (pin 25))
+      (node (ref C39) (pin 1))
       (node (ref R79) (pin 1)))
     (net (code 11) (name /hv/back-emf/W)
       (node (ref R51) (pin 1))
@@ -4457,10 +4457,11 @@
       (node (ref U3) (pin 4))
       (node (ref U15) (pin 5)))
     (net (code 22) (name GNDPWR)
+      (node (ref U25) (pin 23))
       (node (ref R8) (pin 1))
       (node (ref U25) (pin 35))
-      (node (ref U25) (pin 23))
       (node (ref U25) (pin 20))
+      (node (ref U25) (pin 10))
       (node (ref U3) (pin 5))
       (node (ref U25) (pin 47))
       (node (ref U25) (pin 8))
@@ -4472,7 +4473,6 @@
       (node (ref R80) (pin 2))
       (node (ref R81) (pin 2))
       (node (ref R82) (pin 2))
-      (node (ref U25) (pin 10))
       (node (ref C69) (pin 2))
       (node (ref C68) (pin 2))
       (node (ref C50) (pin 2))
@@ -4481,26 +4481,26 @@
       (node (ref C20) (pin 2))
       (node (ref P6) (pin 1))
       (node (ref C97) (pin 2))
-      (node (ref R79) (pin 2))
       (node (ref R162) (pin 2))
-      (node (ref P11) (pin 6))
+      (node (ref R79) (pin 2))
       (node (ref U21) (pin 2))
-      (node (ref P11) (pin 5))
       (node (ref C4) (pin 2))
+      (node (ref P11) (pin 6))
+      (node (ref P11) (pin 5))
       (node (ref U12) (pin 29))
       (node (ref R15) (pin 2))
       (node (ref R53) (pin 2))
       (node (ref R34) (pin 2))
-      (node (ref P7) (pin 1))
       (node (ref R29) (pin 2))
       (node (ref C3) (pin 2))
-      (node (ref C30) (pin 1))
       (node (ref C40) (pin 1))
+      (node (ref C30) (pin 1))
+      (node (ref P7) (pin 1))
       (node (ref D10) (pin 2))
       (node (ref C138) (pin 1))
       (node (ref C78) (pin 1))
-      (node (ref R161) (pin 2))
       (node (ref C58) (pin 2))
+      (node (ref R161) (pin 2))
       (node (ref C70) (pin 2))
       (node (ref C60) (pin 2))
       (node (ref C35) (pin 2))
@@ -4519,9 +4519,9 @@
       (node (ref C127) (pin 1))
       (node (ref R7) (pin 1))
       (node (ref C79) (pin 1))
+      (node (ref C141) (pin 1))
       (node (ref C57) (pin 2))
       (node (ref C82) (pin 1))
-      (node (ref C141) (pin 1))
       (node (ref U4) (pin 5))
       (node (ref D6) (pin 2))
       (node (ref P12) (pin 2))
@@ -4537,8 +4537,8 @@
       (node (ref C5) (pin 2)))
     (net (code 23) (name +3V3)
       (node (ref R105) (pin 1))
-      (node (ref U3) (pin 1))
       (node (ref R119) (pin 1))
+      (node (ref U3) (pin 1))
       (node (ref C18) (pin 1))
       (node (ref U2) (pin 2))
       (node (ref C99) (pin 1))
@@ -4558,70 +4558,70 @@
       (node (ref P13) (pin 4))
       (node (ref U1) (pin 5))
       (node (ref C89) (pin 2))
-      (node (ref JP6) (pin 3))
       (node (ref C87) (pin 2))
       (node (ref C86) (pin 2))
       (node (ref C85) (pin 2))
       (node (ref C84) (pin 2))
+      (node (ref JP6) (pin 3))
       (node (ref C80) (pin 2))
-      (node (ref C77) (pin 2))
       (node (ref C131) (pin 1))
+      (node (ref C77) (pin 2))
       (node (ref L3) (pin 2)))
     (net (code 24) (name +3.3VP)
       (node (ref C79) (pin 2))
       (node (ref R107) (pin 2))
-      (node (ref U25) (pin 3))
       (node (ref U25) (pin 24))
       (node (ref R150) (pin 2))
-      (node (ref U25) (pin 2))
       (node (ref U25) (pin 36))
       (node (ref R115) (pin 1))
-      (node (ref U25) (pin 4))
       (node (ref U25) (pin 48))
       (node (ref L4) (pin 2))
       (node (ref L1) (pin 2))
       (node (ref R21) (pin 1))
       (node (ref C10) (pin 2))
-      (node (ref R90) (pin 2))
+      (node (ref C9) (pin 1))
       (node (ref C35) (pin 1))
       (node (ref C60) (pin 1))
-      (node (ref P7) (pin 4))
+      (node (ref R90) (pin 2))
       (node (ref C4) (pin 1))
-      (node (ref C9) (pin 1))
+      (node (ref U25) (pin 4))
       (node (ref U3) (pin 8))
+      (node (ref P7) (pin 4))
       (node (ref C78) (pin 2))
       (node (ref C30) (pin 2))
       (node (ref U29) (pin 5))
       (node (ref C128) (pin 1))
       (node (ref R58) (pin 2))
-      (node (ref C2) (pin 1))
-      (node (ref U25) (pin 1))
+      (node (ref U25) (pin 3))
+      (node (ref U25) (pin 2))
       (node (ref C82) (pin 2))
       (node (ref C50) (pin 1))
+      (node (ref U25) (pin 1))
       (node (ref JP1) (pin 1))
-      (node (ref U21) (pin 5)))
+      (node (ref U21) (pin 5))
+      (node (ref C2) (pin 1)))
     (net (code 25) (name /hv/driver/CUH)
-      (node (ref U12) (pin 17))
       (node (ref R80) (pin 1))
-      (node (ref R46) (pin 2)))
+      (node (ref R46) (pin 2))
+      (node (ref U12) (pin 17)))
     (net (code 26) (name /hv/driver/CVH)
-      (node (ref R84) (pin 2))
       (node (ref U12) (pin 19))
+      (node (ref R84) (pin 2))
       (node (ref R81) (pin 1)))
     (net (code 27) (name /hv/driver/CWH)
-      (node (ref R100) (pin 2))
       (node (ref R82) (pin 1))
-      (node (ref U12) (pin 21)))
+      (node (ref U12) (pin 21))
+      (node (ref R100) (pin 2)))
     (net (code 28) (name /hv/cur/A_IU)
       (node (ref C33) (pin 1))
-      (node (ref R58) (pin 1))
       (node (ref R46) (pin 1))
-      (node (ref U25) (pin 17)))
+      (node (ref U25) (pin 17))
+      (node (ref R58) (pin 1)))
     (net (code 29) (name /hv/cur/A_IV)
       (node (ref U25) (pin 18))
+      (node (ref R84) (pin 1))
       (node (ref R90) (pin 1))
-      (node (ref C45) (pin 1))
-      (node (ref R84) (pin 1)))
+      (node (ref C45) (pin 1)))
     (net (code 30) (name +15V)
       (node (ref R30) (pin 1))
       (node (ref U12) (pin 28))
@@ -4632,8 +4632,8 @@
       (node (ref C97) (pin 1))
       (node (ref C58) (pin 1))
       (node (ref C69) (pin 1))
-      (node (ref C70) (pin 1))
       (node (ref C68) (pin 1))
+      (node (ref C70) (pin 1))
       (node (ref R161) (pin 1))
       (node (ref C63) (pin 1))
       (node (ref L2) (pin 2))
@@ -4652,26 +4652,26 @@
       (node (ref U12) (pin 16))
       (node (ref R162) (pin 1)))
     (net (code 34) (name /ctrl/f4/IO_AIN0)
-      (node (ref U23) (pin 4))
       (node (ref U26) (pin 15))
+      (node (ref U23) (pin 4))
       (node (ref R105) (pin 2))
       (node (ref R98) (pin 2))
       (node (ref R99) (pin 1))
       (node (ref C52) (pin 1)))
     (net (code 35) (name /ctrl/f4/IO_AIN1)
+      (node (ref U23) (pin 3))
+      (node (ref U26) (pin 16))
+      (node (ref R108) (pin 1))
       (node (ref R106) (pin 2))
       (node (ref C59) (pin 1))
-      (node (ref U23) (pin 3))
-      (node (ref R119) (pin 2))
-      (node (ref R108) (pin 1))
-      (node (ref U26) (pin 16)))
+      (node (ref R119) (pin 2)))
     (net (code 36) (name /ctrl/IO/CAN_TX)
-      (node (ref P10) (pin 5))
       (node (ref U20) (pin 6))
-      (node (ref U26) (pin 82)))
+      (node (ref U26) (pin 82))
+      (node (ref P10) (pin 5)))
     (net (code 37) (name /ctrl/IO/IO_RED)
-      (node (ref D16) (pin 2))
-      (node (ref U26) (pin 84)))
+      (node (ref U26) (pin 84))
+      (node (ref D16) (pin 2)))
     (net (code 38) (name /ctrl/IO/IO_YELLOW)
       (node (ref U26) (pin 85))
       (node (ref D17) (pin 2)))
@@ -4685,10 +4685,10 @@
       (node (ref U28) (pin 3))
       (node (ref U26) (pin 7)))
     (net (code 42) (name /ctrl/FB1/A78)
+      (node (ref C126) (pin 1))
       (node (ref U23) (pin 6))
       (node (ref R138) (pin 2))
       (node (ref R139) (pin 1))
-      (node (ref C126) (pin 1))
       (node (ref U26) (pin 18)))
     (net (code 43) (name /ctrl/FB0/A78)
       (node (ref R136) (pin 1))
@@ -4702,167 +4702,167 @@
       (node (ref P10) (pin 4))
       (node (ref C29) (pin 2)))
     (net (code 45) (name /ctrl/IO/SWCK)
-      (node (ref U26) (pin 76))
       (node (ref P10) (pin 10))
+      (node (ref U26) (pin 76))
       (node (ref U20) (pin 4)))
     (net (code 46) (name /ctrl/IO/SWDIO)
       (node (ref P10) (pin 6))
       (node (ref U20) (pin 1))
       (node (ref U26) (pin 72)))
     (net (code 47) (name /ctrl/FB1/A35)
-      (node (ref U26) (pin 30))
       (node (ref R88) (pin 1))
       (node (ref R96) (pin 1))
-      (node (ref C49) (pin 1)))
+      (node (ref C49) (pin 1))
+      (node (ref U26) (pin 30)))
     (net (code 48) (name /ctrl/FB0/A35)
-      (node (ref U26) (pin 32))
-      (node (ref C48) (pin 1))
       (node (ref R89) (pin 1))
-      (node (ref R95) (pin 1)))
+      (node (ref R95) (pin 1))
+      (node (ref U26) (pin 32))
+      (node (ref C48) (pin 1)))
     (net (code 49) (name /ctrl/FB1/A12)
+      (node (ref U26) (pin 29))
       (node (ref C46) (pin 1))
       (node (ref R94) (pin 1))
-      (node (ref R87) (pin 1))
-      (node (ref U26) (pin 29)))
+      (node (ref R87) (pin 1)))
     (net (code 50) (name /ctrl/FB0/A12)
-      (node (ref R86) (pin 1))
       (node (ref R93) (pin 1))
+      (node (ref R86) (pin 1))
       (node (ref C47) (pin 1))
       (node (ref U26) (pin 31)))
     (net (code 51) (name /ctrl/f4/FB1_L2)
-      (node (ref U26) (pin 39))
-      (node (ref J1) (pin 10)))
+      (node (ref J1) (pin 10))
+      (node (ref U26) (pin 39)))
     (net (code 52) (name /ctrl/f4/FB1_L1)
-      (node (ref J1) (pin 12))
-      (node (ref U26) (pin 38)))
+      (node (ref U26) (pin 38))
+      (node (ref J1) (pin 12)))
     (net (code 53) (name /ctrl/f4/FB0_L2)
-      (node (ref J2) (pin 10))
-      (node (ref U26) (pin 56)))
+      (node (ref U26) (pin 56))
+      (node (ref J2) (pin 10)))
     (net (code 54) (name /ctrl/f4/FB0_L1)
-      (node (ref J2) (pin 12))
-      (node (ref U26) (pin 55)))
+      (node (ref U26) (pin 55))
+      (node (ref J2) (pin 12)))
     (net (code 55) (name /ctrl/f4/CMD_L2)
-      (node (ref U26) (pin 87))
-      (node (ref J3) (pin 10)))
+      (node (ref J3) (pin 10))
+      (node (ref U26) (pin 87)))
     (net (code 56) (name /ctrl/f4/CMD_L1)
-      (node (ref U26) (pin 88))
-      (node (ref J3) (pin 12)))
+      (node (ref J3) (pin 12))
+      (node (ref U26) (pin 88)))
     (net (code 57) (name /ctrl/FB1/E45)
       (node (ref R127) (pin 1))
       (node (ref U26) (pin 45))
-      (node (ref U19) (pin 3))
-      (node (ref U19) (pin 2)))
+      (node (ref U19) (pin 2))
+      (node (ref U19) (pin 3)))
     (net (code 58) (name /ctrl/FB1/E36)
-      (node (ref R126) (pin 1))
       (node (ref U16) (pin 2))
+      (node (ref U26) (pin 43))
       (node (ref U16) (pin 3))
-      (node (ref U26) (pin 43)))
+      (node (ref R126) (pin 1)))
     (net (code 59) (name /ctrl/FB1/E12)
+      (node (ref R124) (pin 1))
       (node (ref U26) (pin 41))
       (node (ref U15) (pin 3))
-      (node (ref R124) (pin 1))
       (node (ref U15) (pin 2)))
     (net (code 60) (name /ctrl/FB0/E45)
+      (node (ref U26) (pin 62))
       (node (ref R128) (pin 1))
       (node (ref U18) (pin 3))
-      (node (ref U18) (pin 2))
-      (node (ref U26) (pin 62)))
+      (node (ref U18) (pin 2)))
     (net (code 61) (name /ctrl/FB0/E36)
-      (node (ref R125) (pin 1))
-      (node (ref U17) (pin 3))
+      (node (ref U26) (pin 57))
       (node (ref U17) (pin 2))
-      (node (ref U26) (pin 57)))
+      (node (ref U17) (pin 3))
+      (node (ref R125) (pin 1)))
     (net (code 62) (name /ctrl/FB0/E12)
+      (node (ref U14) (pin 3))
       (node (ref U14) (pin 2))
       (node (ref R123) (pin 1))
-      (node (ref U14) (pin 3))
       (node (ref U26) (pin 58)))
     (net (code 63) (name /ctrl/f4/CMD_12E)
-      (node (ref U8) (pin 2))
-      (node (ref U8) (pin 3))
       (node (ref U26) (pin 92))
-      (node (ref R101) (pin 1)))
+      (node (ref R101) (pin 1))
+      (node (ref U8) (pin 3))
+      (node (ref U8) (pin 2)))
     (net (code 64) (name /ctrl/f4/CMD_78E)
-      (node (ref U11) (pin 2))
-      (node (ref U11) (pin 3))
       (node (ref R104) (pin 1))
-      (node (ref U26) (pin 37)))
+      (node (ref U26) (pin 37))
+      (node (ref U11) (pin 3))
+      (node (ref U11) (pin 2)))
     (net (code 65) (name /ctrl/f4/CMD_45E)
       (node (ref U10) (pin 3))
+      (node (ref U10) (pin 2))
       (node (ref U26) (pin 96))
-      (node (ref R103) (pin 1))
-      (node (ref U10) (pin 2)))
+      (node (ref R103) (pin 1)))
     (net (code 66) (name /ctrl/f4/CMD_36E)
-      (node (ref U9) (pin 3))
-      (node (ref U9) (pin 2))
       (node (ref R102) (pin 1))
-      (node (ref U26) (pin 93)))
+      (node (ref U9) (pin 3))
+      (node (ref U26) (pin 93))
+      (node (ref U9) (pin 2)))
     (net (code 67) (name /ctrl/f4/CMD_78)
-      (node (ref U26) (pin 95))
       (node (ref U11) (pin 4))
-      (node (ref U11) (pin 1)))
+      (node (ref U11) (pin 1))
+      (node (ref U26) (pin 95)))
     (net (code 68) (name /ctrl/FB1/D45)
       (node (ref U19) (pin 4))
-      (node (ref U26) (pin 54))
-      (node (ref U26) (pin 44))
       (node (ref U19) (pin 1))
-      (node (ref U26) (pin 47)))
+      (node (ref U26) (pin 47))
+      (node (ref U26) (pin 44))
+      (node (ref U26) (pin 54)))
     (net (code 69) (name /ctrl/FB1/D36)
       (node (ref U16) (pin 1))
-      (node (ref U26) (pin 52))
-      (node (ref U26) (pin 42))
       (node (ref U16) (pin 4))
-      (node (ref U26) (pin 51)))
+      (node (ref U26) (pin 51))
+      (node (ref U26) (pin 52))
+      (node (ref U26) (pin 42)))
     (net (code 70) (name /ctrl/FB1/D12)
-      (node (ref U26) (pin 53))
+      (node (ref U15) (pin 4))
       (node (ref U26) (pin 40))
       (node (ref U26) (pin 48))
-      (node (ref U15) (pin 4))
+      (node (ref U26) (pin 53))
       (node (ref U15) (pin 1)))
     (net (code 71) (name /ctrl/FB0/D45)
       (node (ref U26) (pin 63))
-      (node (ref U26) (pin 80))
-      (node (ref U18) (pin 4))
       (node (ref U18) (pin 1))
-      (node (ref U26) (pin 61)))
+      (node (ref U26) (pin 61))
+      (node (ref U18) (pin 4))
+      (node (ref U26) (pin 80)))
     (net (code 72) (name /ctrl/FB0/D36)
       (node (ref U17) (pin 1))
       (node (ref U17) (pin 4))
       (node (ref U26) (pin 78))
-      (node (ref U26) (pin 60))
-      (node (ref U26) (pin 65)))
+      (node (ref U26) (pin 65))
+      (node (ref U26) (pin 60)))
     (net (code 73) (name /ctrl/FB0/D12)
-      (node (ref U14) (pin 4))
-      (node (ref U14) (pin 1))
       (node (ref U26) (pin 64))
       (node (ref U26) (pin 59))
-      (node (ref U26) (pin 79)))
+      (node (ref U26) (pin 79))
+      (node (ref U14) (pin 1))
+      (node (ref U14) (pin 4)))
     (net (code 74) (name /ctrl/f4/CMD_45)
+      (node (ref P10) (pin 1))
       (node (ref U26) (pin 91))
       (node (ref U10) (pin 1))
-      (node (ref U22) (pin 6))
       (node (ref U26) (pin 68))
-      (node (ref P10) (pin 1))
-      (node (ref U10) (pin 4)))
+      (node (ref U10) (pin 4))
+      (node (ref U22) (pin 6)))
     (net (code 75) (name /ctrl/f4/CMD_36)
       (node (ref U22) (pin 1))
+      (node (ref U9) (pin 1))
+      (node (ref U26) (pin 89))
       (node (ref U9) (pin 4))
       (node (ref U26) (pin 67))
-      (node (ref P10) (pin 2))
       (node (ref U26) (pin 23))
-      (node (ref U9) (pin 1))
-      (node (ref U26) (pin 89)))
+      (node (ref P10) (pin 2)))
     (net (code 76) (name /ctrl/f4/CMD_12)
+      (node (ref U22) (pin 4))
       (node (ref U8) (pin 4))
       (node (ref U8) (pin 1))
+      (node (ref P10) (pin 3))
       (node (ref U26) (pin 77))
-      (node (ref U26) (pin 69))
-      (node (ref U22) (pin 4))
       (node (ref U26) (pin 90))
-      (node (ref P10) (pin 3)))
+      (node (ref U26) (pin 69)))
     (net (code 77) (name /ctrl/IO/IO_GREEN)
-      (node (ref U26) (pin 86))
-      (node (ref D18) (pin 2)))
+      (node (ref D18) (pin 2))
+      (node (ref U26) (pin 86)))
     (net (code 78) (name /ctrl/IO/IO_OUT1)
       (node (ref U26) (pin 4))
       (node (ref R10) (pin 2)))
@@ -4876,12 +4876,12 @@
       (node (ref R40) (pin 2))
       (node (ref U26) (pin 2)))
     (net (code 82) (name /ctrl/IO/CAN_RX)
-      (node (ref U26) (pin 81))
       (node (ref U20) (pin 3))
-      (node (ref P10) (pin 7)))
+      (node (ref P10) (pin 7))
+      (node (ref U26) (pin 81)))
     (net (code 83) (name "Net-(JP1-Pad2)")
-      (node (ref R2) (pin 1))
       (node (ref JP1) (pin 2))
+      (node (ref R2) (pin 1))
       (node (ref U25) (pin 44)))
     (net (code 84) (name /hv/f3/SWDIO)
       (node (ref P12) (pin 3))
@@ -4890,13 +4890,13 @@
       (node (ref U25) (pin 37))
       (node (ref P12) (pin 1)))
     (net (code 86) (name /hv/f3/NRST)
-      (node (ref U25) (pin 7))
       (node (ref P12) (pin 4))
+      (node (ref U25) (pin 7))
       (node (ref C7) (pin 1)))
     (net (code 87) (name "Net-(C5-Pad1)")
-      (node (ref U25) (pin 5))
       (node (ref Y1) (pin 1))
-      (node (ref C5) (pin 1)))
+      (node (ref C5) (pin 1))
+      (node (ref U25) (pin 5)))
     (net (code 88) (name "Net-(T45-Pad1)")
       (node (ref U25) (pin 14))
       (node (ref T45) (pin 1)))
@@ -4904,8 +4904,8 @@
       (node (ref T44) (pin 1))
       (node (ref U25) (pin 12)))
     (net (code 90) (name "Net-(T46-Pad1)")
-      (node (ref U25) (pin 16))
-      (node (ref T46) (pin 1)))
+      (node (ref T46) (pin 1))
+      (node (ref U25) (pin 16)))
     (net (code 91) (name "Net-(T1-Pad1)")
       (node (ref U25) (pin 19))
       (node (ref T1) (pin 1)))
@@ -4913,8 +4913,8 @@
       (node (ref U25) (pin 29))
       (node (ref D1) (pin 2)))
     (net (code 93) (name "Net-(D1-Pad1)")
-      (node (ref D1) (pin 1))
-      (node (ref R8) (pin 2)))
+      (node (ref R8) (pin 2))
+      (node (ref D1) (pin 1)))
     (net (code 94) (name /hv/f3/USB_DM)
       (node (ref U25) (pin 32)))
     (net (code 95) (name /hv/f3/USB_DP)
@@ -4963,10 +4963,10 @@
     (net (code 113) (name /hv/f3/IO_TX)
       (node (ref U25) (pin 30)))
     (net (code 114) (name "Net-(C141-Pad2)")
+      (node (ref C141) (pin 2))
       (node (ref C83) (pin 2))
-      (node (ref L1) (pin 1))
       (node (ref U25) (pin 9))
-      (node (ref C141) (pin 2)))
+      (node (ref L1) (pin 1)))
     (net (code 115) (name /hv/f3/NRST)
       (node (ref U21) (pin 6)))
     (net (code 116) (name /hv/f3/SWDIO)
@@ -4978,73 +4978,73 @@
       (node (ref R91) (pin 2)))
     (net (code 119) (name "Net-(C51-Pad1)")
       (node (ref C51) (pin 1))
-      (node (ref R92) (pin 2))
-      (node (ref D11) (pin 1)))
+      (node (ref D11) (pin 1))
+      (node (ref R92) (pin 2)))
     (net (code 120) (name "Net-(R19-Pad1)")
       (node (ref U4) (pin 4))
       (node (ref R21) (pin 2))
       (node (ref R19) (pin 1)))
     (net (code 121) (name "Net-(R143-Pad2)")
-      (node (ref R143) (pin 2))
-      (node (ref R92) (pin 1)))
+      (node (ref R92) (pin 1))
+      (node (ref R143) (pin 2)))
     (net (code 122) (name "Net-(R15-Pad1)")
       (node (ref R19) (pin 2))
       (node (ref R15) (pin 1)))
     (net (code 123) (name "Net-(C41-Pad2)")
       (node (ref R91) (pin 1))
-      (node (ref U5) (pin 8))
-      (node (ref C41) (pin 2))
       (node (ref U5) (pin 6))
       (node (ref U5) (pin 7))
-      (node (ref L2) (pin 1))
-      (node (ref C51) (pin 2))
+      (node (ref U5) (pin 8))
       (node (ref U5) (pin 5))
-      (node (ref D10) (pin 1)))
+      (node (ref C51) (pin 2))
+      (node (ref L2) (pin 1))
+      (node (ref D10) (pin 1))
+      (node (ref C41) (pin 2)))
     (net (code 124) (name VPP)
-      (node (ref P6) (pin 2))
-      (node (ref C3) (pin 1))
-      (node (ref U5) (pin 4))
       (node (ref C38) (pin 1))
       (node (ref C93) (pin 1))
+      (node (ref U12) (pin 13))
       (node (ref C92) (pin 1))
+      (node (ref R77) (pin 1))
       (node (ref C21) (pin 1))
       (node (ref C22) (pin 1))
       (node (ref C28) (pin 1))
       (node (ref C34) (pin 1))
-      (node (ref R77) (pin 1))
-      (node (ref U12) (pin 13)))
+      (node (ref P6) (pin 2))
+      (node (ref U5) (pin 4))
+      (node (ref C3) (pin 1)))
     (net (code 125) (name "Net-(R143-Pad1)")
+      (node (ref R16) (pin 2))
       (node (ref U5) (pin 2))
-      (node (ref R143) (pin 1))
-      (node (ref R16) (pin 2)))
+      (node (ref R143) (pin 1)))
     (net (code 126) (name "Net-(C41-Pad1)")
       (node (ref C41) (pin 1))
       (node (ref U5) (pin 1)))
     (net (code 127) (name "Net-(R30-Pad2)")
-      (node (ref R30) (pin 2))
-      (node (ref R75) (pin 1)))
+      (node (ref R75) (pin 1))
+      (node (ref R30) (pin 2)))
     (net (code 128) (name "Net-(U4-Pad3)")
       (node (ref U4) (pin 3)))
     (net (code 129) (name "Net-(C15-Pad1)")
       (node (ref U4) (pin 6))
       (node (ref C15) (pin 1)))
     (net (code 130) (name "Net-(C15-Pad2)")
+      (node (ref L4) (pin 1))
       (node (ref U4) (pin 1))
-      (node (ref D6) (pin 1))
       (node (ref C15) (pin 2))
-      (node (ref L4) (pin 1)))
+      (node (ref D6) (pin 1)))
     (net (code 131) (name "Net-(D8-Pad2)")
-      (node (ref D8) (pin 2))
-      (node (ref R75) (pin 2)))
+      (node (ref R75) (pin 2))
+      (node (ref D8) (pin 2)))
     (net (code 132) (name "Net-(R27-Pad2)")
-      (node (ref R27) (pin 2))
-      (node (ref R28) (pin 1)))
+      (node (ref R28) (pin 1))
+      (node (ref R27) (pin 2)))
     (net (code 133) (name "Net-(R32-Pad2)")
-      (node (ref R32) (pin 2))
-      (node (ref R33) (pin 1)))
+      (node (ref R33) (pin 1))
+      (node (ref R32) (pin 2)))
     (net (code 134) (name "Net-(R51-Pad2)")
-      (node (ref R52) (pin 1))
-      (node (ref R51) (pin 2)))
+      (node (ref R51) (pin 2))
+      (node (ref R52) (pin 1)))
     (net (code 135) (name "Net-(R77-Pad2)")
       (node (ref R78) (pin 1))
       (node (ref R77) (pin 2)))
@@ -5055,27 +5055,27 @@
       (node (ref C43) (pin 2))
       (node (ref U12) (pin 5)))
     (net (code 138) (name "Net-(C42-Pad2)")
-      (node (ref U12) (pin 1))
-      (node (ref C42) (pin 2)))
+      (node (ref C42) (pin 2))
+      (node (ref U12) (pin 1)))
     (net (code 139) (name "Net-(P1-Pad1)")
       (node (ref P1) (pin 1)))
     (net (code 140) (name "Net-(C119-Pad2)")
-      (node (ref C119) (pin 2))
-      (node (ref L3) (pin 1))
-      (node (ref C65) (pin 2))
       (node (ref U26) (pin 22))
-      (node (ref U26) (pin 21)))
+      (node (ref U26) (pin 21))
+      (node (ref C119) (pin 2))
+      (node (ref C65) (pin 2))
+      (node (ref L3) (pin 1)))
     (net (code 141) (name "Net-(C31-Pad1)")
-      (node (ref Y2) (pin 1))
       (node (ref U26) (pin 12))
+      (node (ref Y2) (pin 1))
       (node (ref C31) (pin 1)))
     (net (code 142) (name "Net-(C32-Pad1)")
-      (node (ref R153) (pin 2))
       (node (ref C32) (pin 1))
-      (node (ref Y2) (pin 2)))
+      (node (ref Y2) (pin 2))
+      (node (ref R153) (pin 2)))
     (net (code 143) (name "Net-(C90-Pad1)")
-      (node (ref C90) (pin 1))
-      (node (ref U26) (pin 73)))
+      (node (ref U26) (pin 73))
+      (node (ref C90) (pin 1)))
     (net (code 144) (name "Net-(C88-Pad1)")
       (node (ref C88) (pin 1))
       (node (ref U26) (pin 49)))
@@ -5086,97 +5086,97 @@
     (net (code 146) (name "Net-(P1-Pad4)")
       (node (ref P1) (pin 4)))
     (net (code 147) (name "Net-(C1-Pad1)")
-      (node (ref C1) (pin 1))
       (node (ref R1) (pin 1))
-      (node (ref P1) (pin 6)))
+      (node (ref P1) (pin 6))
+      (node (ref C1) (pin 1)))
     (net (code 148) (name "Net-(P1-Pad3)")
-      (node (ref U1) (pin 3))
       (node (ref P1) (pin 3))
+      (node (ref U1) (pin 3))
       (node (ref U26) (pin 71)))
     (net (code 149) (name "Net-(U1-Pad4)")
       (node (ref U1) (pin 4)))
     (net (code 150) (name "Net-(U1-Pad6)")
       (node (ref U1) (pin 6)))
     (net (code 151) (name /ctrl/f4/A_5V)
-      (node (ref C81) (pin 1))
+      (node (ref R121) (pin 2))
       (node (ref R122) (pin 1))
-      (node (ref R121) (pin 2)))
+      (node (ref C81) (pin 1)))
     (net (code 152) (name /ctrl/f4/A_24V)
-      (node (ref R116) (pin 2))
       (node (ref R117) (pin 1))
+      (node (ref R116) (pin 2))
       (node (ref C64) (pin 1)))
     (net (code 153) (name "Net-(JP9-Pad2)")
+      (node (ref JP9) (pin 2))
       (node (ref U26) (pin 94))
-      (node (ref R61) (pin 2))
-      (node (ref JP9) (pin 2)))
+      (node (ref R61) (pin 2)))
     (net (code 154) (name +24V)
-      (node (ref R159) (pin 1))
-      (node (ref R160) (pin 1))
-      (node (ref C137) (pin 1))
-      (node (ref P3) (pin 1))
+      (node (ref U28) (pin 2))
+      (node (ref R116) (pin 1))
+      (node (ref D5) (pin 1))
       (node (ref R154) (pin 1))
       (node (ref R157) (pin 1))
       (node (ref R156) (pin 1))
       (node (ref R155) (pin 1))
       (node (ref R158) (pin 1))
-      (node (ref D15) (pin 2))
-      (node (ref C91) (pin 1))
+      (node (ref D3) (pin 1))
       (node (ref C143) (pin 1))
-      (node (ref D14) (pin 2))
-      (node (ref C94) (pin 1))
+      (node (ref D2) (pin 1))
+      (node (ref C102) (pin 1))
+      (node (ref JP3) (pin 3))
+      (node (ref P10) (pin 11))
+      (node (ref C104) (pin 1))
       (node (ref D4) (pin 2))
-      (node (ref R116) (pin 1))
-      (node (ref C95) (pin 1))
-      (node (ref C100) (pin 1))
-      (node (ref U13) (pin 2))
-      (node (ref C130) (pin 1))
+      (node (ref C103) (pin 1))
       (node (ref VR1) (pin 1))
       (node (ref C133) (pin 1))
-      (node (ref P10) (pin 11))
-      (node (ref C103) (pin 1))
-      (node (ref C104) (pin 1))
-      (node (ref JP3) (pin 3))
+      (node (ref C137) (pin 1))
       (node (ref D24) (pin 2))
-      (node (ref C102) (pin 1))
-      (node (ref P5) (pin 1))
-      (node (ref P5) (pin 3))
-      (node (ref P5) (pin 5))
-      (node (ref P9) (pin 1))
+      (node (ref C130) (pin 1))
       (node (ref P9) (pin 4))
-      (node (ref U28) (pin 2))
+      (node (ref D14) (pin 2))
+      (node (ref C100) (pin 1))
+      (node (ref C95) (pin 1))
+      (node (ref C94) (pin 1))
+      (node (ref P9) (pin 1))
+      (node (ref P5) (pin 5))
+      (node (ref C91) (pin 1))
+      (node (ref P5) (pin 3))
+      (node (ref P5) (pin 1))
       (node (ref D22) (pin 1))
-      (node (ref D2) (pin 1))
+      (node (ref D15) (pin 2))
       (node (ref C120) (pin 1))
-      (node (ref D3) (pin 1))
-      (node (ref D5) (pin 1))
-      (node (ref U27) (pin 2)))
+      (node (ref U13) (pin 2))
+      (node (ref P3) (pin 1))
+      (node (ref R160) (pin 1))
+      (node (ref U27) (pin 2))
+      (node (ref R159) (pin 1)))
     (net (code 155) (name "Net-(R153-Pad1)")
-      (node (ref R153) (pin 1))
-      (node (ref U26) (pin 13)))
+      (node (ref U26) (pin 13))
+      (node (ref R153) (pin 1)))
     (net (code 156) (name +5V)
-      (node (ref C66) (pin 1))
-      (node (ref C8) (pin 1))
+      (node (ref L5) (pin 2))
       (node (ref JP4) (pin 2))
       (node (ref C109) (pin 1))
-      (node (ref P10) (pin 12))
-      (node (ref L5) (pin 2))
       (node (ref R145) (pin 1))
-      (node (ref C61) (pin 1))
-      (node (ref U22) (pin 5))
       (node (ref U20) (pin 5))
-      (node (ref JP6) (pin 1))
-      (node (ref U2) (pin 3))
       (node (ref C135) (pin 1))
-      (node (ref C111) (pin 1))
+      (node (ref U22) (pin 5))
+      (node (ref C61) (pin 1))
+      (node (ref C66) (pin 1))
+      (node (ref P10) (pin 12))
+      (node (ref JP6) (pin 1))
+      (node (ref C8) (pin 1))
+      (node (ref U2) (pin 3))
       (node (ref C96) (pin 1))
+      (node (ref C111) (pin 1))
       (node (ref C107) (pin 1)))
     (net (code 157) (name +5VA)
-      (node (ref L8) (pin 1))
+      (node (ref R121) (pin 1))
       (node (ref C116) (pin 2))
       (node (ref C113) (pin 2))
-      (node (ref R121) (pin 1))
-      (node (ref L10) (pin 1))
-      (node (ref JP6) (pin 2)))
+      (node (ref L8) (pin 1))
+      (node (ref JP6) (pin 2))
+      (node (ref L10) (pin 1)))
     (net (code 158) (name /ctrl/f4/A_24V)
       (node (ref U26) (pin 36)))
     (net (code 159) (name /ctrl/f4/A_5V)
@@ -5191,74 +5191,74 @@
       (node (ref C101) (pin 1))
       (node (ref C62) (pin 1)))
     (net (code 162) (name +5F)
-      (node (ref R140) (pin 2))
-      (node (ref JP5) (pin 1))
-      (node (ref C134) (pin 1))
-      (node (ref C123) (pin 1))
-      (node (ref L12) (pin 2))
-      (node (ref JP2) (pin 1))
-      (node (ref R144) (pin 1))
-      (node (ref R137) (pin 2))
-      (node (ref L7) (pin 2))
       (node (ref C122) (pin 1))
-      (node (ref C112) (pin 1))
-      (node (ref JP4) (pin 1))
+      (node (ref JP5) (pin 1))
       (node (ref C124) (pin 1))
+      (node (ref L12) (pin 2))
+      (node (ref C112) (pin 1))
+      (node (ref L7) (pin 2))
       (node (ref L11) (pin 1))
-      (node (ref L9) (pin 1))
+      (node (ref JP2) (pin 1))
+      (node (ref C123) (pin 1))
+      (node (ref R137) (pin 2))
+      (node (ref R144) (pin 1))
       (node (ref C118) (pin 2))
-      (node (ref C115) (pin 2)))
+      (node (ref C115) (pin 2))
+      (node (ref R140) (pin 2))
+      (node (ref L9) (pin 1))
+      (node (ref C134) (pin 1))
+      (node (ref JP4) (pin 1)))
     (net (code 163) (name "Net-(R132-Pad1)")
       (node (ref R132) (pin 1))
-      (node (ref U28) (pin 4))
-      (node (ref R133) (pin 2)))
+      (node (ref R133) (pin 2))
+      (node (ref U28) (pin 4)))
     (net (code 164) (name +12V)
-      (node (ref JP2) (pin 3))
-      (node (ref C110) (pin 1))
-      (node (ref L6) (pin 2))
+      (node (ref C136) (pin 1))
       (node (ref JP5) (pin 3))
       (node (ref C108) (pin 1))
+      (node (ref C110) (pin 1))
+      (node (ref JP2) (pin 3))
+      (node (ref L6) (pin 2))
       (node (ref JP3) (pin 1))
-      (node (ref R146) (pin 1))
       (node (ref C132) (pin 1))
-      (node (ref C136) (pin 1)))
+      (node (ref R146) (pin 1)))
     (net (code 165) (name "Net-(C139-Pad1)")
-      (node (ref C144) (pin 1))
-      (node (ref C139) (pin 1))
       (node (ref C140) (pin 1))
-      (node (ref C142) (pin 1))
+      (node (ref C144) (pin 1))
+      (node (ref R154) (pin 2))
       (node (ref R160) (pin 2))
-      (node (ref R154) (pin 2)))
+      (node (ref C142) (pin 1))
+      (node (ref C139) (pin 1)))
     (net (code 166) (name "Net-(D24-Pad1)")
-      (node (ref D24) (pin 1))
-      (node (ref R149) (pin 1)))
+      (node (ref R149) (pin 1))
+      (node (ref D24) (pin 1)))
     (net (code 167) (name "Net-(R133-Pad1)")
-      (node (ref R144) (pin 2))
-      (node (ref R133) (pin 1)))
+      (node (ref R133) (pin 1))
+      (node (ref R144) (pin 2)))
     (net (code 168) (name "Net-(R145-Pad2)")
-      (node (ref R145) (pin 2))
-      (node (ref R60) (pin 1)))
+      (node (ref R60) (pin 1))
+      (node (ref R145) (pin 2)))
     (net (code 169) (name "Net-(R146-Pad2)")
       (node (ref R146) (pin 2))
       (node (ref R97) (pin 1)))
     (net (code 170) (name "Net-(C121-Pad1)")
-      (node (ref U28) (pin 6))
-      (node (ref C121) (pin 1)))
+      (node (ref C121) (pin 1))
+      (node (ref U28) (pin 6)))
     (net (code 171) (name "Net-(C106-Pad2)")
-      (node (ref L6) (pin 1))
       (node (ref C106) (pin 2))
-      (node (ref D12) (pin 1))
-      (node (ref U27) (pin 1)))
+      (node (ref U27) (pin 1))
+      (node (ref L6) (pin 1))
+      (node (ref D12) (pin 1)))
     (net (code 172) (name "Net-(C105-Pad2)")
-      (node (ref D9) (pin 1))
       (node (ref C105) (pin 2))
       (node (ref L5) (pin 1))
+      (node (ref D9) (pin 1))
       (node (ref U13) (pin 1)))
     (net (code 173) (name "Net-(U13-Pad3)")
       (node (ref U13) (pin 3)))
     (net (code 174) (name "Net-(R35-Pad1)")
-      (node (ref R60) (pin 2))
       (node (ref R35) (pin 1))
+      (node (ref R60) (pin 2))
       (node (ref U13) (pin 4)))
     (net (code 175) (name "Net-(C105-Pad1)")
       (node (ref C105) (pin 1))
@@ -5266,110 +5266,110 @@
     (net (code 176) (name "Net-(U27-Pad3)")
       (node (ref U27) (pin 3)))
     (net (code 177) (name "Net-(R59-Pad1)")
-      (node (ref R97) (pin 2))
+      (node (ref R59) (pin 1))
       (node (ref U27) (pin 4))
-      (node (ref R59) (pin 1)))
+      (node (ref R97) (pin 2)))
     (net (code 178) (name "Net-(C106-Pad1)")
-      (node (ref C106) (pin 1))
-      (node (ref U27) (pin 6)))
+      (node (ref U27) (pin 6))
+      (node (ref C106) (pin 1)))
     (net (code 179) (name "Net-(J3-Pad5)")
-      (node (ref R68) (pin 2))
       (node (ref R69) (pin 1))
+      (node (ref R68) (pin 2))
+      (node (ref U10) (pin 6))
       (node (ref J3) (pin 5))
-      (node (ref P15) (pin 1))
-      (node (ref U10) (pin 6)))
+      (node (ref P15) (pin 1)))
     (net (code 180) (name "Net-(J3-Pad6)")
-      (node (ref R67) (pin 1))
       (node (ref J3) (pin 6))
+      (node (ref R67) (pin 1))
       (node (ref U9) (pin 7))
       (node (ref R66) (pin 2)))
     (net (code 181) (name "Net-(J3-Pad7)")
+      (node (ref R72) (pin 1))
       (node (ref J3) (pin 7))
       (node (ref R71) (pin 2))
-      (node (ref U11) (pin 6))
-      (node (ref R72) (pin 1)))
+      (node (ref U11) (pin 6)))
     (net (code 182) (name "Net-(J3-Pad1)")
-      (node (ref U8) (pin 6))
-      (node (ref R63) (pin 1))
       (node (ref R62) (pin 2))
-      (node (ref J3) (pin 1)))
+      (node (ref J3) (pin 1))
+      (node (ref U8) (pin 6))
+      (node (ref R63) (pin 1)))
     (net (code 183) (name "Net-(J3-Pad11)")
-      (node (ref R17) (pin 1))
-      (node (ref J3) (pin 11)))
+      (node (ref J3) (pin 11))
+      (node (ref R17) (pin 1)))
     (net (code 184) (name "Net-(J3-Pad9)")
-      (node (ref J3) (pin 9))
-      (node (ref R18) (pin 1)))
+      (node (ref R18) (pin 1))
+      (node (ref J3) (pin 9)))
     (net (code 185) (name GNDD)
-      (node (ref R31) (pin 1))
       (node (ref J1) (pin 13))
-      (node (ref J2) (pin 13))
       (node (ref J3) (pin 13))
+      (node (ref J2) (pin 13))
+      (node (ref R31) (pin 1))
       (node (ref C17) (pin 1)))
     (net (code 186) (name "Net-(J3-Pad4)")
-      (node (ref R70) (pin 1))
-      (node (ref P15) (pin 2))
-      (node (ref R69) (pin 2))
       (node (ref U10) (pin 7))
-      (node (ref J3) (pin 4)))
+      (node (ref J3) (pin 4))
+      (node (ref P15) (pin 2))
+      (node (ref R70) (pin 1))
+      (node (ref R69) (pin 2)))
     (net (code 187) (name "Net-(J3-Pad3)")
       (node (ref J3) (pin 3))
+      (node (ref R65) (pin 2))
       (node (ref R66) (pin 1))
-      (node (ref U9) (pin 6))
-      (node (ref R65) (pin 2)))
+      (node (ref U9) (pin 6)))
     (net (code 188) (name "Net-(J3-Pad8)")
       (node (ref J3) (pin 8))
+      (node (ref R73) (pin 1))
       (node (ref U11) (pin 7))
-      (node (ref R72) (pin 2))
-      (node (ref R73) (pin 1)))
+      (node (ref R72) (pin 2)))
     (net (code 189) (name "Net-(J3-Pad2)")
-      (node (ref J3) (pin 2))
-      (node (ref U8) (pin 7))
       (node (ref R64) (pin 1))
+      (node (ref U8) (pin 7))
+      (node (ref J3) (pin 2))
       (node (ref R63) (pin 2)))
     (net (code 190) (name "Net-(C53-Pad1)")
       (node (ref C53) (pin 1))
-      (node (ref U9) (pin 8))
-      (node (ref R71) (pin 1))
-      (node (ref R68) (pin 1))
-      (node (ref C54) (pin 1))
-      (node (ref L7) (pin 1))
-      (node (ref U10) (pin 8))
       (node (ref C55) (pin 1))
+      (node (ref L7) (pin 1))
       (node (ref U11) (pin 8))
       (node (ref C56) (pin 1))
+      (node (ref U10) (pin 8))
       (node (ref U8) (pin 8))
+      (node (ref R71) (pin 1))
+      (node (ref U9) (pin 8))
+      (node (ref R68) (pin 1))
+      (node (ref C54) (pin 1))
       (node (ref R62) (pin 1))
       (node (ref R65) (pin 1)))
     (net (code 191) (name "Net-(C25-Pad2)")
-      (node (ref R39) (pin 1))
-      (node (ref R56) (pin 2))
       (node (ref C25) (pin 2))
-      (node (ref U6) (pin 6)))
+      (node (ref R39) (pin 1))
+      (node (ref U6) (pin 6))
+      (node (ref R56) (pin 2)))
     (net (code 192) (name "Net-(C25-Pad1)")
       (node (ref R36) (pin 1))
-      (node (ref R50) (pin 2))
+      (node (ref C25) (pin 1))
       (node (ref U6) (pin 5))
-      (node (ref C25) (pin 1)))
+      (node (ref R50) (pin 2)))
     (net (code 193) (name "Net-(C13-Pad1)")
-      (node (ref C13) (pin 1))
-      (node (ref R47) (pin 1))
-      (node (ref R50) (pin 1))
       (node (ref R24) (pin 2))
-      (node (ref R147) (pin 1)))
+      (node (ref R147) (pin 1))
+      (node (ref C13) (pin 1))
+      (node (ref R50) (pin 1))
+      (node (ref R47) (pin 1)))
     (net (code 194) (name "Net-(R55-Pad1)")
+      (node (ref U6) (pin 1))
       (node (ref R86) (pin 2))
-      (node (ref R55) (pin 1))
-      (node (ref U6) (pin 1)))
+      (node (ref R55) (pin 1)))
     (net (code 195) (name "Net-(J2-Pad5)")
       (node (ref R114) (pin 1))
-      (node (ref U18) (pin 6))
-      (node (ref J2) (pin 5)))
+      (node (ref J2) (pin 5))
+      (node (ref U18) (pin 6)))
     (net (code 196) (name "Net-(J2-Pad9)")
       (node (ref J2) (pin 9))
       (node (ref R6) (pin 1)))
     (net (code 197) (name "Net-(J2-Pad11)")
-      (node (ref J2) (pin 11))
-      (node (ref R3) (pin 1)))
+      (node (ref R3) (pin 1))
+      (node (ref J2) (pin 11)))
     (net (code 198) (name "Net-(R147-Pad2)")
       (node (ref R25) (pin 1))
       (node (ref R147) (pin 2)))
@@ -5378,57 +5378,57 @@
       (node (ref R89) (pin 2))
       (node (ref R56) (pin 1)))
     (net (code 200) (name "Net-(C27-Pad1)")
-      (node (ref U6) (pin 3))
       (node (ref C27) (pin 1))
-      (node (ref R47) (pin 2))
-      (node (ref R42) (pin 1)))
+      (node (ref U6) (pin 3))
+      (node (ref R42) (pin 1))
+      (node (ref R47) (pin 2)))
     (net (code 201) (name "Net-(C27-Pad2)")
       (node (ref R44) (pin 1))
       (node (ref R55) (pin 2))
-      (node (ref C27) (pin 2))
-      (node (ref U6) (pin 2)))
+      (node (ref U6) (pin 2))
+      (node (ref C27) (pin 2)))
     (net (code 202) (name "Net-(C114-Pad1)")
-      (node (ref R137) (pin 1))
       (node (ref JP2) (pin 2))
-      (node (ref R135) (pin 1))
       (node (ref J2) (pin 7))
-      (node (ref C114) (pin 1)))
+      (node (ref C114) (pin 1))
+      (node (ref R137) (pin 1))
+      (node (ref R135) (pin 1)))
     (net (code 203) (name "Net-(R130-Pad2)")
-      (node (ref R24) (pin 1))
-      (node (ref R130) (pin 2)))
+      (node (ref R130) (pin 2))
+      (node (ref R24) (pin 1)))
     (net (code 204) (name "Net-(C36-Pad2)")
-      (node (ref C36) (pin 2))
       (node (ref L8) (pin 2))
+      (node (ref R130) (pin 1))
       (node (ref U6) (pin 8))
-      (node (ref R130) (pin 1)))
+      (node (ref C36) (pin 2)))
     (net (code 205) (name "Net-(C72-Pad1)")
-      (node (ref C74) (pin 1))
+      (node (ref L9) (pin 2))
+      (node (ref U14) (pin 8))
       (node (ref C75) (pin 1))
-      (node (ref U17) (pin 8))
       (node (ref U18) (pin 8))
       (node (ref C72) (pin 1))
-      (node (ref U14) (pin 8))
-      (node (ref L9) (pin 2)))
+      (node (ref C74) (pin 1))
+      (node (ref U17) (pin 8)))
     (net (code 206) (name "Net-(J2-Pad6)")
-      (node (ref J2) (pin 6))
       (node (ref R39) (pin 2))
       (node (ref U17) (pin 7))
-      (node (ref R111) (pin 2)))
+      (node (ref R111) (pin 2))
+      (node (ref J2) (pin 6)))
     (net (code 207) (name "Net-(J2-Pad3)")
-      (node (ref U17) (pin 6))
       (node (ref R111) (pin 1))
-      (node (ref R36) (pin 2))
-      (node (ref J2) (pin 3)))
+      (node (ref U17) (pin 6))
+      (node (ref J2) (pin 3))
+      (node (ref R36) (pin 2)))
     (net (code 208) (name "Net-(J2-Pad2)")
-      (node (ref R44) (pin 2))
       (node (ref R109) (pin 2))
+      (node (ref U14) (pin 7))
       (node (ref J2) (pin 2))
-      (node (ref U14) (pin 7)))
+      (node (ref R44) (pin 2)))
     (net (code 209) (name "Net-(J2-Pad1)")
-      (node (ref R109) (pin 1))
+      (node (ref U14) (pin 6))
       (node (ref J2) (pin 1))
       (node (ref R42) (pin 2))
-      (node (ref U14) (pin 6)))
+      (node (ref R109) (pin 1)))
     (net (code 210) (name "Net-(J2-Pad4)")
       (node (ref J2) (pin 4))
       (node (ref U18) (pin 7))
@@ -5438,11 +5438,11 @@
     (net (code 212) (name "Net-(U6-Pad4)")
       (node (ref U6) (pin 4)))
     (net (code 213) (name "Net-(P9-Pad5)")
-      (node (ref P9) (pin 5))
-      (node (ref R106) (pin 1)))
+      (node (ref R106) (pin 1))
+      (node (ref P9) (pin 5)))
     (net (code 214) (name "Net-(P9-Pad2)")
-      (node (ref P9) (pin 2))
-      (node (ref R98) (pin 1)))
+      (node (ref R98) (pin 1))
+      (node (ref P9) (pin 2)))
     (net (code 215) (name "Net-(D4-Pad1)")
       (node (ref D4) (pin 1))
       (node (ref R20) (pin 1)))
@@ -5453,8 +5453,8 @@
       (node (ref D15) (pin 1))
       (node (ref R74) (pin 1)))
     (net (code 218) (name "Net-(D20-Pad1)")
-      (node (ref R134) (pin 1))
-      (node (ref D20) (pin 1)))
+      (node (ref D20) (pin 1))
+      (node (ref R134) (pin 1)))
     (net (code 219) (name "Net-(D19-Pad1)")
       (node (ref D19) (pin 1))
       (node (ref R120) (pin 1)))
diff --git a/hw/kicad/v4.0/supply.sch b/hw/kicad/v4.0/supply.sch
index b8d88eaf..8c54a3f9 100644
--- a/hw/kicad/v4.0/supply.sch
+++ b/hw/kicad/v4.0/supply.sch
@@ -15,7 +15,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L stmbl1:zldo1117 U2
+L stmbl:zldo1117 U2
 U 1 1 566074A9
 P 2000 5150
 F 0 "U2" H 2150 4954 60  0000 C CNN
@@ -31,7 +31,7 @@ F 8 "" H 2000 5150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C18
+L stmbl:C C18
 U 1 1 566075DC
 P 2700 5350
 F 0 "C18" H 2725 5450 50  0000 L CNN
@@ -44,7 +44,7 @@ F 5 "X7R" H 2700 5350 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C8
+L stmbl:C C8
 U 1 1 566076FA
 P 1500 5350
 F 0 "C8" H 1525 5450 50  0000 L CNN
@@ -57,7 +57,7 @@ F 5 "X7R" H 1500 5350 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+5V #PWR072
+L stmbl:+5V #PWR072
 U 1 1 5660786F
 P 1200 5000
 F 0 "#PWR072" H 1200 4850 50  0001 C CNN
@@ -68,7 +68,7 @@ F 3 "" H 1200 5000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3V #PWR073
+L stmbl:+3.3V #PWR073
 U 1 1 566078DE
 P 2950 5000
 F 0 "#PWR073" H 2950 4850 50  0001 C CNN
@@ -79,7 +79,7 @@ F 3 "" H 2950 5000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:CONN_01X02 P3
+L stmbl:CONN_01X02 P3
 U 1 1 566CDEAC
 P 800 3000
 F 0 "P3" H 800 3150 50  0000 C CNN
@@ -95,7 +95,7 @@ F 8 "" H 800 3000 60  0001 C CNN "Tolerance"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR074
+L stmbl:GND #PWR074
 U 1 1 57744A84
 P 1200 5650
 F 0 "#PWR074" H 1200 5400 50  0001 C CNN
@@ -106,7 +106,7 @@ F 3 "" H 1200 5650 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C110
+L stmbl:C C110
 U 1 1 57AD279A
 P 8200 5350
 F 0 "C110" H 8225 5450 50  0000 L CNN
@@ -122,7 +122,7 @@ F 8 "X7R" H 8200 5350 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R97
+L stmbl:R R97
 U 1 1 57AD27A0
 P 6950 5100
 F 0 "R97" V 7030 5100 50  0000 C CNN
@@ -138,7 +138,7 @@ F 8 "1%" H 6950 5100 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R59
+L stmbl:R R59
 U 1 1 57AD27A6
 P 6700 5350
 F 0 "R59" V 6780 5350 50  0000 C CNN
@@ -154,7 +154,7 @@ F 8 "1%" H 6700 5350 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:D_Schottky D12
+L stmbl:D_Schottky D12
 U 1 1 57AD27AC
 P 7200 5350
 F 0 "D12" H 7200 5450 50  0000 C CNN
@@ -170,7 +170,7 @@ F 8 "" H 7200 5350 60  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C106
+L stmbl:C C106
 U 1 1 57AD27B2
 P 6850 4800
 F 0 "C106" H 6875 4900 50  0000 L CNN
@@ -186,7 +186,7 @@ F 8 "X7R" H 6850 4800 60  0001 C CNN "Tolerance"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:INDUCTOR L6
+L stmbl:INDUCTOR L6
 U 1 1 57AD27B8
 P 7600 4950
 F 0 "L6" V 7550 4950 50  0000 C CNN
@@ -202,7 +202,7 @@ F 8 "" H 7600 4950 60  0001 C CNN "Tolerance"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:GND #PWR075
+L stmbl:GND #PWR075
 U 1 1 57AD27D2
 P 5000 5700
 F 0 "#PWR075" H 5000 5450 50  0001 C CNN
@@ -213,7 +213,7 @@ F 3 "" H 5000 5700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+24V #PWR076
+L stmbl:+24V #PWR076
 U 1 1 57AD27DC
 P 5000 4700
 F 0 "#PWR076" H 5000 4550 50  0001 C CNN
@@ -224,7 +224,7 @@ F 3 "" H 5000 4700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C109
+L stmbl:C C109
 U 1 1 57AD3DA2
 P 8450 3550
 F 0 "C109" H 8475 3650 50  0000 L CNN
@@ -240,7 +240,7 @@ F 8 "X7R" H 8450 3550 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R60
+L stmbl:R R60
 U 1 1 57AD3DA8
 P 6950 3300
 F 0 "R60" V 7030 3300 50  0000 C CNN
@@ -256,7 +256,7 @@ F 8 "1%" H 6950 3300 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R35
+L stmbl:R R35
 U 1 1 57AD3DAE
 P 6700 3550
 F 0 "R35" V 6780 3550 50  0000 C CNN
@@ -272,7 +272,7 @@ F 8 "1%" H 6700 3550 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:D_Schottky D9
+L stmbl:D_Schottky D9
 U 1 1 57AD3DB4
 P 7200 3550
 F 0 "D9" H 7200 3650 50  0000 C CNN
@@ -288,7 +288,7 @@ F 8 "" H 7200 3550 60  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C105
+L stmbl:C C105
 U 1 1 57AD3DBA
 P 6850 3000
 F 0 "C105" H 6875 3100 50  0000 L CNN
@@ -304,7 +304,7 @@ F 8 "X7R" H 6850 3000 60  0001 C CNN "Tolerance"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:INDUCTOR L5
+L stmbl:INDUCTOR L5
 U 1 1 57AD3DC0
 P 7600 3150
 F 0 "L5" V 7550 3150 50  0000 C CNN
@@ -320,7 +320,7 @@ F 8 "" H 7600 3150 60  0001 C CNN "Tolerance"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:ACT4088 U13
+L stmbl:ACT4088 U13
 U 1 1 57AD3DD4
 P 6200 3150
 F 0 "U13" H 6050 3400 60  0000 C CNN
@@ -336,7 +336,7 @@ F 8 "" H 6200 3150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR077
+L stmbl:GND #PWR077
 U 1 1 57AD3DDA
 P 5050 3900
 F 0 "#PWR077" H 5050 3650 50  0001 C CNN
@@ -347,7 +347,7 @@ F 3 "" H 5050 3900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+24V #PWR078
+L stmbl:+24V #PWR078
 U 1 1 57AD3DE4
 P 5050 2900
 F 0 "#PWR078" H 5050 2750 50  0001 C CNN
@@ -359,7 +359,7 @@ F 3 "" H 5050 2900 60  0000 C CNN
 $EndComp
 NoConn ~ 5800 3150
 $Comp
-L stmbl1:+5V #PWR079
+L stmbl:+5V #PWR079
 U 1 1 57AD3DF9
 P 8000 3050
 F 0 "#PWR079" H 8000 2900 50  0001 C CNN
@@ -370,7 +370,7 @@ F 3 "" H 8000 3050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+12V #PWR080
+L stmbl:+12V #PWR080
 U 1 1 57AD61BC
 P 8000 4850
 F 0 "#PWR080" H 8000 4700 50  0001 C CNN
@@ -381,7 +381,7 @@ F 3 "" H 8000 4850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C96
+L stmbl:C C96
 U 1 1 57AF3925
 P 1200 5350
 F 0 "C96" H 1225 5450 50  0000 L CNN
@@ -397,7 +397,7 @@ F 8 "X7R" H 1200 5350 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C108
+L stmbl:C C108
 U 1 1 57AF3EB7
 P 7700 5350
 F 0 "C108" H 7725 5450 50  0000 L CNN
@@ -413,7 +413,7 @@ F 8 "X7R" H 7700 5350 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C107
+L stmbl:C C107
 U 1 1 57AF42AD
 P 7700 3550
 F 0 "C107" H 7725 3650 50  0000 L CNN
@@ -429,7 +429,7 @@ F 8 "X7R" H 7700 3550 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C103
+L stmbl:C C103
 U 1 1 57AF47AC
 P 5050 3550
 F 0 "C103" H 5075 3650 50  0000 L CNN
@@ -445,7 +445,7 @@ F 8 "X7R" H 5050 3550 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C104
+L stmbl:C C104
 U 1 1 57AF48FA
 P 5000 5350
 F 0 "C104" H 5025 5450 50  0000 L CNN
@@ -461,7 +461,7 @@ F 8 "X7R" H 5000 5350 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C99
+L stmbl:C C99
 U 1 1 57AF53FF
 P 2450 5350
 F 0 "C99" H 2475 5450 50  0000 L CNN
@@ -477,7 +477,7 @@ F 8 "X7R" H 2450 5350 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C111
+L stmbl:C C111
 U 1 1 57AF630D
 P 8200 3550
 F 0 "C111" H 8225 3650 50  0000 L CNN
@@ -493,7 +493,7 @@ F 8 "X7R" H 8200 3550 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR081
+L stmbl:GND #PWR081
 U 1 1 57B218AB
 P 2500 3550
 F 0 "#PWR081" H 2500 3300 50  0001 C CNN
@@ -504,7 +504,7 @@ F 3 "" H 2500 3550 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C101
+L stmbl:C C101
 U 1 1 57B21BDA
 P 2500 3150
 F 0 "C101" H 2525 3250 50  0000 L CNN
@@ -520,7 +520,7 @@ F 8 "X7R" H 2500 3150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C102
+L stmbl:C C102
 U 1 1 57B21C48
 P 5300 5350
 F 0 "C102" H 5325 5450 50  0000 L CNN
@@ -536,7 +536,7 @@ F 8 "X7R" H 5300 5350 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C123
+L stmbl:C C123
 U 1 1 57D63C06
 P 8450 2050
 F 0 "C123" H 8475 2150 50  0000 L CNN
@@ -552,7 +552,7 @@ F 8 "X7R" H 8450 2050 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R133
+L stmbl:R R133
 U 1 1 57D63C0C
 P 6950 1800
 F 0 "R133" V 7030 1800 50  0000 C CNN
@@ -568,7 +568,7 @@ F 8 "1%" H 6950 1800 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:D_Schottky D13
+L stmbl:D_Schottky D13
 U 1 1 57D63C18
 P 7200 2050
 F 0 "D13" H 7200 2150 50  0000 C CNN
@@ -584,7 +584,7 @@ F 8 "" H 7200 2050 60  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:C C121
+L stmbl:C C121
 U 1 1 57D63C1E
 P 6850 1500
 F 0 "C121" H 6875 1600 50  0000 L CNN
@@ -600,7 +600,7 @@ F 8 "X7R" H 6850 1500 60  0001 C CNN "Tolerance"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:INDUCTOR L12
+L stmbl:INDUCTOR L12
 U 1 1 57D63C24
 P 7600 1650
 F 0 "L12" V 7550 1650 50  0000 C CNN
@@ -616,7 +616,7 @@ F 8 "" H 7600 1650 60  0001 C CNN "Tolerance"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:ACT4088 U28
+L stmbl:ACT4088 U28
 U 1 1 57D63C38
 P 6200 1650
 F 0 "U28" H 6050 1900 60  0000 C CNN
@@ -632,7 +632,7 @@ F 8 "" H 6200 1650 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:GND #PWR082
+L stmbl:GND #PWR082
 U 1 1 57D63C3E
 P 5050 2400
 F 0 "#PWR082" H 5050 2150 50  0001 C CNN
@@ -643,7 +643,7 @@ F 3 "" H 5050 2400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+24V #PWR083
+L stmbl:+24V #PWR083
 U 1 1 57D63C47
 P 5050 1400
 F 0 "#PWR083" H 5050 1250 50  0001 C CNN
@@ -654,7 +654,7 @@ F 3 "" H 5050 1400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C122
+L stmbl:C C122
 U 1 1 57D63C68
 P 7700 2050
 F 0 "C122" H 7725 2150 50  0000 L CNN
@@ -670,7 +670,7 @@ F 8 "X7R" H 7700 2050 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C120
+L stmbl:C C120
 U 1 1 57D63C71
 P 5050 2050
 F 0 "C120" H 5075 2150 50  0000 L CNN
@@ -686,7 +686,7 @@ F 8 "X7R" H 5050 2050 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C124
+L stmbl:C C124
 U 1 1 57D63C7A
 P 8200 2050
 F 0 "C124" H 8225 2150 50  0000 L CNN
@@ -702,7 +702,7 @@ F 8 "X7R" H 8200 2050 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+5F #PWR084
+L stmbl:+5F #PWR084
 U 1 1 57D6418F
 P 8000 1550
 F 0 "#PWR084" H 8000 1400 50  0001 C CNN
@@ -715,7 +715,7 @@ $EndComp
 Text HLabel 5700 1650 0    60   Input ~ 0
 EN_5V
 $Comp
-L stmbl1:ACT4088 U27
+L stmbl:ACT4088 U27
 U 1 1 57AD27CC
 P 6200 4950
 F 0 "U27" H 6050 5200 60  0000 C CNN
@@ -737,7 +737,7 @@ CPU, IO and analog
 Text Notes 8250 1550 0    60   ~ 0
 FB and RS485
 $Comp
-L stmbl1:Jumper_NO_Small JP4
+L stmbl:Jumper_NO_Small JP4
 U 1 1 57D95B7C
 P 9350 1800
 F 0 "JP4" H 9350 1880 50  0000 C CNN
@@ -753,7 +753,7 @@ F 8 "" H 9350 1800 50  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+5F #PWR085
+L stmbl:+5F #PWR085
 U 1 1 57D95C13
 P 9150 1700
 F 0 "#PWR085" H 9150 1550 50  0001 C CNN
@@ -764,7 +764,7 @@ F 3 "" H 9150 1700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+5V #PWR086
+L stmbl:+5V #PWR086
 U 1 1 57D95CA2
 P 9550 1700
 F 0 "#PWR086" H 9550 1550 50  0001 C CNN
@@ -775,7 +775,7 @@ F 3 "" H 9550 1700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R146
+L stmbl:R R146
 U 1 1 5812447C
 P 7450 5100
 F 0 "R146" V 7530 5100 50  0000 C CNN
@@ -791,7 +791,7 @@ F 8 "1%" H 7450 5100 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R145
+L stmbl:R R145
 U 1 1 581247B5
 P 7450 3300
 F 0 "R145" V 7530 3300 50  0000 C CNN
@@ -807,7 +807,7 @@ F 8 "1%" H 7450 3300 30  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:R R144
+L stmbl:R R144
 U 1 1 581254D2
 P 7450 1800
 F 0 "R144" V 7530 1800 50  0000 C CNN
@@ -827,7 +827,7 @@ Text Notes 9100 2750 0    60   ~ 0
 Text Notes 9100 2900 0    60   ~ 0
 0.81V * (51k + 1k + 3.9k) / 3.9k = 11.6V
 $Comp
-L stmbl1:D_Schottky D22
+L stmbl:D_Schottky D22
 U 1 1 581AE161
 P 1750 3150
 F 0 "D22" H 1750 3250 50  0000 C CNN
@@ -843,7 +843,7 @@ F 8 "" H 1750 3150 60  0001 C CNN "Tolerance"
 	0    1    1    0   
 $EndComp
 $Comp
-L stmbl1:+24V #PWR087
+L stmbl:+24V #PWR087
 U 1 1 581B5518
 P 4600 2300
 F 0 "#PWR087" H 4600 2150 50  0001 C CNN
@@ -854,7 +854,7 @@ F 3 "" H 4600 2300 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R149
+L stmbl:R R149
 U 1 1 5817A2EE
 P 1400 3200
 F 0 "R149" V 1500 3100 50  0000 L CNN
@@ -870,7 +870,7 @@ F 8 "1%" H 1400 3200 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:Led_Small D24
+L stmbl:Led_Small D24
 U 1 1 5817A2F5
 P 1400 2850
 F 0 "D24" H 1350 2975 50  0000 L CNN
@@ -886,7 +886,7 @@ F 8 "" V 1400 2850 50  0001 C CNN "Tolerance"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L stmbl1:C C136
+L stmbl:C C136
 U 1 1 5824ACDB
 P 7950 5350
 F 0 "C136" H 7975 5450 50  0000 L CNN
@@ -902,7 +902,7 @@ F 8 "X7R" H 7950 5350 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C135
+L stmbl:C C135
 U 1 1 5824C702
 P 7950 3550
 F 0 "C135" H 7975 3650 50  0000 L CNN
@@ -918,7 +918,7 @@ F 8 "X7R" H 7950 3550 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C134
+L stmbl:C C134
 U 1 1 58250581
 P 7950 2050
 F 0 "C134" H 7975 2150 50  0000 L CNN
@@ -934,7 +934,7 @@ F 8 "X7R" H 7950 2050 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R132
+L stmbl:R R132
 U 1 1 57D63C12
 P 6700 2050
 F 0 "R132" V 6780 2050 50  0000 C CNN
@@ -950,7 +950,7 @@ F 8 "1%" H 6700 2050 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C132
+L stmbl:C C132
 U 1 1 582791CF
 P 8450 5350
 F 0 "C132" H 8475 5450 50  0000 L CNN
@@ -966,7 +966,7 @@ F 8 "X7R" H 8450 5350 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C131
+L stmbl:C C131
 U 1 1 5828EFB0
 P 2950 5350
 F 0 "C131" H 2975 5450 50  0000 L CNN
@@ -982,7 +982,7 @@ F 8 "X7R" H 2950 5350 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C137
+L stmbl:C C137
 U 1 1 5829DD53
 P 5300 3550
 F 0 "C137" H 5325 3650 50  0000 L CNN
@@ -998,7 +998,7 @@ F 8 "X7R" H 5300 3550 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C133
+L stmbl:C C133
 U 1 1 5829DE03
 P 5300 2050
 F 0 "C133" H 5325 2150 50  0000 L CNN
@@ -1014,7 +1014,7 @@ F 8 "X7R" H 5300 2050 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:VR VR1
+L stmbl:VR VR1
 U 1 1 582FC365
 P 1200 3050
 F 0 "VR1" V 1260 3004 50  0000 C TNN
@@ -1028,7 +1028,7 @@ F 6 " " H 1200 3050 50  0001 C CNN "Source"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C62
+L stmbl:C C62
 U 1 1 583297B2
 P 2750 3150
 F 0 "C62" H 2775 3250 50  0000 L CNN
@@ -1044,7 +1044,7 @@ F 8 "X7R" H 2750 3150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C139
+L stmbl:C C139
 U 1 1 5832CFE2
 P 3000 3150
 F 0 "C139" H 3025 3250 50  0000 L CNN
@@ -1060,7 +1060,7 @@ F 8 "X7R" H 3000 3150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C140
+L stmbl:C C140
 U 1 1 5832D0A0
 P 3250 3150
 F 0 "C140" H 3275 3250 50  0000 L CNN
@@ -1076,7 +1076,7 @@ F 8 "X7R" H 3250 3150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C142
+L stmbl:C C142
 U 1 1 5833FCEB
 P 3500 3150
 F 0 "C142" H 3525 3250 50  0000 L CNN
@@ -1092,7 +1092,7 @@ F 8 "X7R" H 3500 3150 60  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:JUMPER3_NC JP6
+L stmbl:JUMPER3_NC JP6
 U 1 1 5832AA58
 P 10450 1650
 F 0 "JP6" H 10500 1550 50  0000 L CNN
@@ -1108,7 +1108,7 @@ F 8 "" H 10450 1650 50  0001 C CNN "Tolerance"
 	1    0    0    1   
 $EndComp
 $Comp
-L stmbl1:+5V #PWR088
+L stmbl:+5V #PWR088
 U 1 1 5832AF71
 P 10100 1550
 F 0 "#PWR088" H 10100 1400 50  0001 C CNN
@@ -1119,7 +1119,7 @@ F 3 "" H 10100 1550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+3.3V #PWR089
+L stmbl:+3.3V #PWR089
 U 1 1 5832B0AA
 P 10800 1550
 F 0 "#PWR089" H 10800 1400 50  0001 C CNN
@@ -1130,7 +1130,7 @@ F 3 "" H 10800 1550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:+5VA #PWR090
+L stmbl:+5VA #PWR090
 U 1 1 5832B172
 P 10450 1450
 F 0 "#PWR090" H 10450 1300 50  0001 C CNN
@@ -1142,7 +1142,7 @@ F 3 "" H 10450 1450 50  0000 C CNN
 $EndComp
 NoConn ~ 5800 4950
 $Comp
-L stmbl1:CP C143
+L stmbl:CP C143
 U 1 1 584F61D7
 P 2000 3150
 F 0 "C143" H 2025 3250 50  0000 L CNN
@@ -1158,7 +1158,7 @@ F 8 "" H 2000 3150 50  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R158
+L stmbl:R R158
 U 1 1 5884D28E
 P 4600 3150
 F 0 "R158" V 4700 3050 50  0000 L CNN
@@ -1174,7 +1174,7 @@ F 8 "1%" H 4600 3150 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R155
+L stmbl:R R155
 U 1 1 5884FB7D
 P 4000 3150
 F 0 "R155" V 4100 3050 50  0000 L CNN
@@ -1190,7 +1190,7 @@ F 8 "1%" H 4000 3150 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R156
+L stmbl:R R156
 U 1 1 5884FC85
 P 4200 3150
 F 0 "R156" V 4300 3050 50  0000 L CNN
@@ -1206,7 +1206,7 @@ F 8 "1%" H 4200 3150 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R157
+L stmbl:R R157
 U 1 1 5884FD91
 P 4400 3150
 F 0 "R157" V 4500 3050 50  0000 L CNN
@@ -1222,7 +1222,7 @@ F 8 "1%" H 4400 3150 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:R R154
+L stmbl:R R154
 U 1 1 588520BC
 P 3000 2650
 F 0 "R154" V 3100 2550 50  0000 L CNN
@@ -1238,7 +1238,7 @@ F 8 "1%" H 3000 2650 30  0001 C CNN "Tolerance"
 	1    0    0    -1  
 $EndComp
 $Comp
-L stmbl1:C C144
+L stmbl:C C144
 U 1 1 58856551
 P 3750 3150
 F 0 "C144" H 3775 3250 50  0000 L CNN
@@ -1639,7 +1639,7 @@ Wire Wire Line
 	4600 3450 4600 3300
 Connection ~ 4600 2400
 $Comp
-L stmbl1:R R159
+L stmbl:R R159
 U 1 1 5885E706
 P 2750 2650
 F 0 "R159" V 2850 2550 50  0000 L CNN
@@ -1665,7 +1665,7 @@ Wire Wire Line
 	2750 2400 2750 2500
 Connection ~ 2750 2400
 $Comp
-L stmbl1:R R160
+L stmbl:R R160
 U 1 1 5885FDC7
 P 3250 2650
 F 0 "R160" V 3350 2550 50  0000 L CNN
diff --git a/hw/kicad/v4.0/sym-lib-table b/hw/kicad/v4.0/sym-lib-table
new file mode 100644
index 00000000..2b9dceb6
--- /dev/null
+++ b/hw/kicad/v4.0/sym-lib-table
@@ -0,0 +1,3 @@
+(sym_lib_table
+  (lib (name stmbl)(type KiCad)(uri "$(KIPRJMOD)/../lib/stmbl.lib")(options "")(descr ""))
+)