diff --git a/HW/mouse/Encoder.pretty/EC10E.kicad_mod b/HW/mouse/Encoder.pretty/EC10E.kicad_mod
new file mode 100644
index 0000000000000000000000000000000000000000..315d6b853edf11a6b4c9b42faf957cf54f443355
--- /dev/null
+++ b/HW/mouse/Encoder.pretty/EC10E.kicad_mod
@@ -0,0 +1,39 @@
+(module EC10E (layer F.Cu) (tedit 6022EAAF)
+  (fp_text reference REF** (at 2.5 0) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value EC10E (at 2.5 -3.81) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -2.5292 4.522978) (end 7.5292 4.522978) (layer F.SilkS) (width 0.1524))
+  (fp_line (start 7.5292 4.522978) (end 7.5292 3.336041) (layer F.SilkS) (width 0.1524))
+  (fp_line (start 7.5292 -1.827022) (end -2.5292 -1.827022) (layer F.SilkS) (width 0.1524))
+  (fp_line (start -2.5292 -1.827022) (end -2.5292 0.663961) (layer F.SilkS) (width 0.1524))
+  (fp_line (start -2.4022 4.395978) (end 7.4022 4.395978) (layer F.Fab) (width 0.1524))
+  (fp_line (start 7.4022 4.395978) (end 7.4022 -1.700022) (layer F.Fab) (width 0.1524))
+  (fp_line (start 7.4022 -1.700022) (end -2.4022 -1.700022) (layer F.Fab) (width 0.1524))
+  (fp_line (start -2.4022 -1.700022) (end -2.4022 4.395978) (layer F.Fab) (width 0.1524))
+  (fp_line (start -2.5292 3.336041) (end -2.5292 4.522978) (layer F.SilkS) (width 0.1524))
+  (fp_line (start 7.5292 0.663961) (end 7.5292 -1.827022) (layer F.SilkS) (width 0.1524))
+  (fp_line (start -3.155699 -1.954022) (end -3.155699 4.649978) (layer F.CrtYd) (width 0.1524))
+  (fp_line (start -3.155699 4.649978) (end 8.155699 4.649978) (layer F.CrtYd) (width 0.1524))
+  (fp_line (start 8.155699 4.649978) (end 8.155699 -1.954022) (layer F.CrtYd) (width 0.1524))
+  (fp_line (start 8.155699 -1.954022) (end -3.155699 -1.954022) (layer F.CrtYd) (width 0.1524))
+  (fp_circle (center 0 -1.905) (end 0.381 -1.905) (layer F.Fab) (width 0.1524))
+  (fp_circle (center -3.1642 0) (end -2.7832 0) (layer F.SilkS) (width 0.1524))
+  (fp_circle (center -3.1642 0) (end -2.7832 0) (layer B.SilkS) (width 0.1524))
+  (fp_text user "Copyright 2016 Accelerated Designs. All rights reserved." (at 0 0) (layer Cmts.User)
+    (effects (font (size 0.127 0.127) (thickness 0.002)))
+  )
+  (fp_text user * (at 0 0) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user * (at 0 0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 thru_hole circle (at 0 0) (size 2.0066 2.0066) (drill 1.4986) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 2.5 0) (size 2.0066 2.0066) (drill 1.4986) (layers *.Cu *.Mask))
+  (pad 3 thru_hole circle (at 5 0) (size 2.0066 2.0066) (drill 1.4986) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole rect (at -1.999999 2.000001) (size 1.8034 2.0066) (drill oval 1.8034 2.0066) (layers *.Cu *.Mask))
+  (pad "" np_thru_hole rect (at 6.999999 2.000001) (size 1.8034 2.0066) (drill oval 1.8034 2.0066) (layers *.Cu *.Mask))
+)
diff --git a/HW/mouse/fp-info-cache b/HW/mouse/fp-info-cache
index 72beb2703332b52cf2e1afd49497940e7b55f946..fe866e8e175e639f95d6e06d8af86229d461cc83 100644
--- a/HW/mouse/fp-info-cache
+++ b/HW/mouse/fp-info-cache
@@ -1,4 +1,4 @@
-18628461420359934
+18633300470975509
 Battery
 BatteryHolder_Bulgin_BX0036_1xC
 Bulgin Battery Holder, BX0036, Battery Type C (https://www.bulgin.com/products/pub/media/bulgin/data/Battery_holders.pdf)
@@ -50623,6 +50623,13 @@ One digit LED 7 segment SA39-11 SC39-11 SA39-12 SC39-12
 0
 10
 10
+Encoder
+EC10E
+
+
+0
+3
+3
 Ferrite_THT
 LairdTech_28C0236-0JW-10
 Ferrite, vertical, LairdTech 28C0236-0JW-10, https://assets.lairdtech.com/home/brandworld/files/28C0236-0JW-10.pdf, JW Miller core https://www.bourns.com/products/magnetic-products/j.w.-miller-through-hole-ferrite-beads-emi-filters
@@ -58029,13 +58036,6 @@ Mounting 4.5mm 9774100982
 0
 8
 1
-MouseSensor
-PMW3389
-
-
-0
-16
-16
 NetTie
 NetTie-2_SMD_Pad0.5mm
 Net tie, 2 pin, 0.5mm square SMD pads
@@ -82046,3 +82046,24 @@ varistor SIOV
 0
 2
 2
+enc
+EC10E1220501
+
+
+0
+3
+3
+ul_EC10E1220501
+EC10E1220501
+
+
+0
+5
+5
+ul_EC10E1220501
+mouse_encoder
+
+
+0
+0
+0
diff --git a/HW/mouse/mouse-cache.lib b/HW/mouse/mouse-cache.lib
index ba74c38ba3cf3cff97b2f8f635ce92f4937960a3..c6c5bd6c61674acf25925b9cbb9612c0b0977705 100644
--- a/HW/mouse/mouse-cache.lib
+++ b/HW/mouse/mouse-cache.lib
@@ -1,11 +1,77 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# Connector_Conn_01x01_Male
+# mouse-rescue_+3.3V-power
 #
-DEF Connector_Conn_01x01_Male J 0 40 Y N 1 F N
+DEF mouse-rescue_+3.3V-power #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "mouse-rescue_+3.3V-power" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +3V3 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# mouse-rescue_+5V-power
+#
+DEF mouse-rescue_+5V-power #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "mouse-rescue_+5V-power" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# mouse-rescue_AP2127N-3.3-Regulator_Linear
+#
+DEF mouse-rescue_AP2127N-3.3-Regulator_Linear U 0 10 Y Y 1 F N
+F0 "U" -150 125 50 H V C CNN
+F1 "mouse-rescue_AP2127N-3.3-Regulator_Linear" 0 125 50 H V L CNN
+F2 "Package_TO_SOT_SMD:SOT-23" 0 225 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOT?23*
+$ENDFPLIST
+DRAW
+S -200 75 200 -200 0 1 10 f
+X GND 1 0 -300 100 U 50 50 1 1 W
+X VO 2 300 0 100 L 50 50 1 1 w
+X VI 3 -300 0 100 R 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# mouse-rescue_C-Device
+#
+DEF mouse-rescue_C-Device C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "mouse-rescue_C-Device" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# mouse-rescue_Conn_01x01_Male-Connector
+#
+DEF mouse-rescue_Conn_01x01_Male-Connector J 0 40 Y N 1 F N
 F0 "J" 0 100 50 H V C CNN
-F1 "Connector_Conn_01x01_Male" 0 -100 50 H V C CNN
+F1 "mouse-rescue_Conn_01x01_Male-Connector" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -18,11 +84,11 @@ X Pin_1 1 200 0 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_Conn_01x05_Male
+# mouse-rescue_Conn_01x05_Male-Connector
 #
-DEF Connector_Conn_01x05_Male J 0 40 Y N 1 F N
+DEF mouse-rescue_Conn_01x05_Male-Connector J 0 40 Y N 1 F N
 F0 "J" 0 300 50 H V C CNN
-F1 "Connector_Conn_01x05_Male" 0 -300 50 H V C CNN
+F1 "mouse-rescue_Conn_01x05_Male-Connector" 0 -300 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -47,11 +113,11 @@ X Pin_5 5 200 -200 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_Conn_01x06_Male
+# mouse-rescue_Conn_01x06_Male-Connector
 #
-DEF Connector_Conn_01x06_Male J 0 40 Y N 1 F N
+DEF mouse-rescue_Conn_01x06_Male-Connector J 0 40 Y N 1 F N
 F0 "J" 0 300 50 H V C CNN
-F1 "Connector_Conn_01x06_Male" 0 -400 50 H V C CNN
+F1 "mouse-rescue_Conn_01x06_Male-Connector" 0 -400 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -79,29 +145,11 @@ X Pin_6 6 200 -300 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device_C
-#
-DEF Device_C C 0 10 N Y 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "Device_C" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- C_*
-$ENDFPLIST
-DRAW
-P 2 0 1 20 -80 -30 80 -30 N
-P 2 0 1 20 -80 30 80 30 N
-X ~ 1 0 150 110 D 50 50 1 1 P
-X ~ 2 0 -150 110 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Device_Crystal
+# mouse-rescue_Crystal-Device
 #
-DEF Device_Crystal Y 0 40 N N 1 F N
+DEF mouse-rescue_Crystal-Device Y 0 40 N N 1 F N
 F0 "Y" 0 150 50 H V C CNN
-F1 "Device_Crystal" 0 -150 50 H V C CNN
+F1 "mouse-rescue_Crystal-Device" 0 -150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -118,11 +166,24 @@ X 2 2 150 0 50 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device_Jumper
+# mouse-rescue_GND-power
 #
-DEF Device_Jumper JP 0 30 Y N 1 F N
+DEF mouse-rescue_GND-power #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "mouse-rescue_GND-power" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# mouse-rescue_Jumper-Device
+#
+DEF mouse-rescue_Jumper-Device JP 0 30 Y N 1 F N
 F0 "JP" 0 150 50 H V C CNN
-F1 "Device_Jumper" 0 -80 50 H V C CNN
+F1 "mouse-rescue_Jumper-Device" 0 -80 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -140,11 +201,11 @@ X 2 2 300 0 165 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# Device_LED
+# mouse-rescue_LED-Device
 #
-DEF Device_LED D 0 40 N N 1 F N
+DEF mouse-rescue_LED-Device D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "Device_LED" 0 -100 50 H V C CNN
+F1 "mouse-rescue_LED-Device" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -163,11 +224,59 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device_R
+# mouse-rescue_MIC5205-3.0YM5-Regulator_Linear
 #
-DEF Device_R R 0 0 N Y 1 F N
+DEF mouse-rescue_MIC5205-3.0YM5-Regulator_Linear U 0 10 Y Y 1 F N
+F0 "U" -150 225 50 H V C CNN
+F1 "mouse-rescue_MIC5205-3.0YM5-Regulator_Linear" 0 225 50 H V L CNN
+F2 "Package_TO_SOT_SMD:SOT-23-5" 0 325 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOT?23*
+$ENDFPLIST
+DRAW
+S -200 175 200 -200 0 1 10 f
+X IN 1 -300 100 100 R 50 50 1 1 W
+X GND 2 0 -300 100 U 50 50 1 1 W
+X EN 3 -300 0 100 R 50 50 1 1 I
+X BP 4 300 0 100 L 50 50 1 1 I
+X OUT 5 300 100 100 L 50 50 1 1 w
+ENDDRAW
+ENDDEF
+#
+# mouse-rescue_PMW3389-mouseComp
+#
+DEF mouse-rescue_PMW3389-mouseComp U 0 40 Y Y 1 F N
+F0 "U" 0 650 50 H V C CNN
+F1 "mouse-rescue_PMW3389-mouseComp" 0 550 50 H V C CNN
+F2 "" 0 600 50 H I C CNN
+F3 "" 0 600 50 H I C CNN
+DRAW
+S -350 450 350 -450 1 1 0 f
+X NC_0 1 -450 350 100 R 50 50 1 1 N
+X SCLK 10 450 -250 100 L 50 50 1 1 I
+X MOSI 11 450 -150 100 L 50 50 1 1 I
+X MISO 12 450 -50 100 L 50 50 1 1 O
+X NCS 13 450 50 100 L 50 50 1 1 I
+X NC_3 14 450 150 100 L 50 50 1 1 N
+X LED1_P~ 15 450 250 100 L 50 50 1 1 I
+X NC 16 450 350 100 L 50 50 1 1 N
+X NC_1 2 -450 250 100 R 50 50 1 1 N
+X VDDPIX 3 -450 150 100 R 50 50 1 1 w
+X VDD 4 -450 50 100 R 50 50 1 1 W
+X VDDIO 5 -450 -50 100 R 50 50 1 1 W
+X GP0 6 -450 -150 100 R 50 50 1 1 N
+X NRESET 7 -450 -250 100 R 50 50 1 1 I
+X GND 8 -450 -350 100 R 50 50 1 1 W
+X MOTION 9 450 -350 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
+# mouse-rescue_R-Device
+#
+DEF mouse-rescue_R-Device R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
-F1 "Device_R" 0 0 50 V V C CNN
+F1 "mouse-rescue_R-Device" 0 0 50 V V C CNN
 F2 "" -70 0 50 V I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
@@ -180,11 +289,11 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device_Rotary_Encoder
+# mouse-rescue_Rotary_Encoder-Device
 #
-DEF Device_Rotary_Encoder SW 0 10 Y N 1 F N
+DEF mouse-rescue_Rotary_Encoder-Device SW 0 10 Y N 1 F N
 F0 "SW" 0 260 50 H V C CNN
-F1 "Device_Rotary_Encoder" 0 -260 50 H V C CNN
+F1 "mouse-rescue_Rotary_Encoder-Device" 0 -260 50 H V C CNN
 F2 "" -150 160 50 H I C CNN
 F3 "" 0 260 50 H I C CNN
 $FPLIST
@@ -210,14 +319,13 @@ X C C -300 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# MCU_ST_STM32F4_STM32F411RETx
+# mouse-rescue_STM32F411RETx-MCU_ST_STM32F4
 #
-DEF MCU_ST_STM32F4_STM32F411RETx U 0 20 Y Y 1 F N
+DEF mouse-rescue_STM32F411RETx-MCU_ST_STM32F4 U 0 20 Y Y 1 F N
 F0 "U" -600 1650 50 H V L CNN
-F1 "MCU_ST_STM32F4_STM32F411RETx" 400 1650 50 H V L CNN
+F1 "mouse-rescue_STM32F411RETx-MCU_ST_STM32F4" 400 1650 50 H V L CNN
 F2 "Package_QFP:LQFP-64_10x10mm_P0.5mm" -600 -1700 50 H I R CNN
 F3 "" 0 0 50 H I C CNN
-ALIAS STM32F411RETx
 $FPLIST
  LQFP*10x10mm*P0.5mm*
 $ENDFPLIST
@@ -290,11 +398,46 @@ X PC1 9 -700 -200 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# Power_Protection_USBLC6-2SC6
+# mouse-rescue_SW_Push-Switch
+#
+DEF mouse-rescue_SW_Push-Switch SW 0 40 N N 1 F N
+F0 "SW" 50 100 50 H V L CNN
+F1 "mouse-rescue_SW_Push-Switch" 0 -60 50 H V C CNN
+F2 "" 0 200 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
+DRAW
+C -80 0 20 0 1 0 N
+C 80 0 20 0 1 0 N
+P 2 0 1 0 0 50 0 120 N
+P 2 0 1 0 100 50 -100 50 N
+X 1 1 -200 0 100 R 50 50 0 1 P
+X 2 2 200 0 100 L 50 50 0 1 P
+ENDDRAW
+ENDDEF
+#
+# mouse-rescue_SW_SPDT-mouseComp
 #
-DEF Power_Protection_USBLC6-2SC6 U 0 20 Y N 1 F N
+DEF mouse-rescue_SW_SPDT-mouseComp SW 0 0 Y N 1 F N
+F0 "SW" 0 170 50 H V C CNN
+F1 "mouse-rescue_SW_SPDT-mouseComp" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+C -80 0 20 0 0 0 N
+C 80 -100 20 0 0 0 N
+C 80 100 20 0 1 0 N
+P 2 0 1 0 -60 10 65 90 N
+X B 1 -200 0 100 R 50 50 1 1 P
+X C 2 200 -100 100 L 50 50 1 1 P
+X A 3 200 100 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# mouse-rescue_USBLC6-2SC6-Power_Protection
+#
+DEF mouse-rescue_USBLC6-2SC6-Power_Protection U 0 20 Y N 1 F N
 F0 "U" 100 350 50 H V L CNN
-F1 "Power_Protection_USBLC6-2SC6" 100 -350 50 H V L CNN
+F1 "mouse-rescue_USBLC6-2SC6-Power_Protection" 100 -350 50 H V L CNN
 F2 "Package_TO_SOT_SMD:SOT-23-6" 0 -500 50 H I C CNN
 F3 "" 200 350 50 H I C CNN
 $FPLIST
@@ -340,158 +483,11 @@ X I/O1 6 -400 100 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Regulator_Linear_AP2127N-3.3
-#
-DEF Regulator_Linear_AP2127N-3.3 U 0 10 Y Y 1 F N
-F0 "U" -150 125 50 H V C CNN
-F1 "Regulator_Linear_AP2127N-3.3" 0 125 50 H V L CNN
-F2 "Package_TO_SOT_SMD:SOT-23" 0 225 50 H I C CIN
-F3 "" 0 0 50 H I C CNN
-ALIAS APE8865N-15-HF-3 APE8865N-16-HF-3 APE8865N-17-HF-3 APE8865N-18-HF-3 APE8865N-19-HF-3 APE8865N-20-HF-3 APE8865N-21-HF-3 APE8865N-22-HF-3 APE8865N-23-HF-3 APE8865N-24-HF-3 APE8865N-25-HF-3 APE8865N-26-HF-3 APE8865N-27-HF-3 APE8865N-28-HF-3 APE8865N-29-HF-3 APE8865N-30-HF-3 APE8865N-31-HF-3 APE8865N-32-HF-3 APE8865N-33-HF-3 AP2127N-1.0 AP2127N-1.2 AP2127N-1.5 AP2127N-1.8 AP2127N-2.5 AP2127N-2.8 AP2127N-3.0 AP2127N-3.3 XC6206PxxxMR
-$FPLIST
- SOT?23*
-$ENDFPLIST
-DRAW
-S -200 75 200 -200 0 1 10 f
-X GND 1 0 -300 100 U 50 50 1 1 W
-X VO 2 300 0 100 L 50 50 1 1 w
-X VI 3 -300 0 100 R 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# Regulator_Linear_MIC5205-3.0YM5
-#
-DEF Regulator_Linear_MIC5205-3.0YM5 U 0 10 Y Y 1 F N
-F0 "U" -150 225 50 H V C CNN
-F1 "Regulator_Linear_MIC5205-3.0YM5" 0 225 50 H V L CNN
-F2 "Package_TO_SOT_SMD:SOT-23-5" 0 325 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-ALIAS AP131-18 AP131-20 AP131-25 AP131-28 AP131-29 AP131-30 AP131-33 AP131-35 MIC5205-2.5YM5 MIC5205-2.7YM5 MIC5205-2.8YM5 MIC5205-2.85YM5 MIC5205-2.9YM5 MIC5205-3.0YM5 MIC5205-3.1YM5 MIC5205-3.2YM5 MIC5205-3.3YM5 MIC5205-3.6YM5 MIC5205-3.8YM5 MIC5205-4.0YM5 MIC5205-5.0YM5 MIC5219-2.5YM5 MIC5219-2.6YM5 MIC5219-2.7YM5 MIC5219-2.8YM5 MIC5219-2.85YM5 MIC5219-2.9YM5 MIC5219-3.0YM5 MIC5219-3.1YM5 MIC5219-3.3YM5 MIC5219-3.6YM5 MIC5219-5.0YM5 SPX3819M5-L-1-2 SPX3819M5-L-1-5 SPX3819M5-L-1-8 SPX3819M5-L-2-5 SPX3819M5-L-3-0 SPX3819M5-L-3-3 SPX3819M5-L-5-0
-$FPLIST
- SOT?23*
-$ENDFPLIST
-DRAW
-S -200 175 200 -200 0 1 10 f
-X IN 1 -300 100 100 R 50 50 1 1 W
-X GND 2 0 -300 100 U 50 50 1 1 W
-X EN 3 -300 0 100 R 50 50 1 1 I
-X BP 4 300 0 100 L 50 50 1 1 I
-X OUT 5 300 100 100 L 50 50 1 1 w
-ENDDRAW
-ENDDEF
-#
-# Switch_SW_Push
-#
-DEF Switch_SW_Push SW 0 40 N N 1 F N
-F0 "SW" 50 100 50 H V L CNN
-F1 "Switch_SW_Push" 0 -60 50 H V C CNN
-F2 "" 0 200 50 H I C CNN
-F3 "" 0 200 50 H I C CNN
-DRAW
-C -80 0 20 0 1 0 N
-C 80 0 20 0 1 0 N
-P 2 0 1 0 0 50 0 120 N
-P 2 0 1 0 100 50 -100 50 N
-X 1 1 -200 0 100 R 50 50 0 1 P
-X 2 2 200 0 100 L 50 50 0 1 P
-ENDDRAW
-ENDDEF
-#
-# mouse-rescue_PMW3389-mouseComp
-#
-DEF mouse-rescue_PMW3389-mouseComp U 0 40 Y Y 1 F N
-F0 "U" 0 650 50 H V C CNN
-F1 "mouse-rescue_PMW3389-mouseComp" 0 550 50 H V C CNN
-F2 "" 0 600 50 H I C CNN
-F3 "" 0 600 50 H I C CNN
-DRAW
-S -350 450 350 -450 1 1 0 f
-X NC_0 1 -450 350 100 R 50 50 1 1 N
-X SCLK 10 450 -250 100 L 50 50 1 1 I
-X MOSI 11 450 -150 100 L 50 50 1 1 I
-X MISO 12 450 -50 100 L 50 50 1 1 O
-X NCS 13 450 50 100 L 50 50 1 1 I
-X NC_3 14 450 150 100 L 50 50 1 1 N
-X LED1_P~ 15 450 250 100 L 50 50 1 1 I
-X NC 16 450 350 100 L 50 50 1 1 N
-X NC_1 2 -450 250 100 R 50 50 1 1 N
-X VDDPIX 3 -450 150 100 R 50 50 1 1 w
-X VDD 4 -450 50 100 R 50 50 1 1 W
-X VDDIO 5 -450 -50 100 R 50 50 1 1 W
-X GP0 6 -450 -150 100 R 50 50 1 1 N
-X NRESET 7 -450 -250 100 R 50 50 1 1 I
-X GND 8 -450 -350 100 R 50 50 1 1 W
-X MOTION 9 450 -350 100 L 50 50 1 1 O
-ENDDRAW
-ENDDEF
-#
-# mouseComp_SW_SPDT
-#
-DEF mouseComp_SW_SPDT SW 0 0 Y N 1 F N
-F0 "SW" 0 170 50 H V C CNN
-F1 "mouseComp_SW_SPDT" 0 -200 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-C -80 0 20 0 0 0 N
-C 80 -100 20 0 0 0 N
-C 80 100 20 0 1 0 N
-P 2 0 1 0 -60 10 65 90 N
-X B 1 -200 0 100 R 50 50 1 1 P
-X C 2 200 -100 100 L 50 50 1 1 P
-X A 3 200 100 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# power_+3.3V
-#
-DEF power_+3.3V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "power_+3.3V" 0 140 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-ALIAS +3.3V
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +3V3 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# power_+5V
-#
-DEF power_+5V #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "power_+5V" 0 140 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 2 0 1 0 -30 50 0 100 N
-P 2 0 1 0 0 0 0 100 N
-P 2 0 1 0 0 100 30 50 N
-X +5V 1 0 0 0 U 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# power_GND
-#
-DEF power_GND #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -250 50 H I C CNN
-F1 "power_GND" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
-X GND 1 0 0 0 D 50 50 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# power_VCC
+# mouse-rescue_VCC-power
 #
-DEF power_VCC #PWR 0 0 Y Y 1 F P
+DEF mouse-rescue_VCC-power #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -150 50 H I C CNN
-F1 "power_VCC" 0 150 50 H V C CNN
+F1 "mouse-rescue_VCC-power" 0 150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
diff --git a/HW/mouse/mouse-rescue.lib b/HW/mouse/mouse-rescue.lib
index c75dd1f4153855f85fea73942209d82fd1c5d684..73f3cd105b3da7ba0f3a3451458554021f160248 100644
--- a/HW/mouse/mouse-rescue.lib
+++ b/HW/mouse/mouse-rescue.lib
@@ -289,6 +289,36 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Rotary_Encoder-Device
+#
+DEF Rotary_Encoder-Device SW 0 10 Y N 1 F N
+F0 "SW" 0 260 50 H V C CNN
+F1 "Rotary_Encoder-Device" 0 -260 50 H V C CNN
+F2 "" -150 160 50 H I C CNN
+F3 "" 0 260 50 H I C CNN
+$FPLIST
+ RotaryEncoder*
+$ENDFPLIST
+DRAW
+A -15 -2 108 -899 899 0 1 10 N -15 -110 -15 105
+C -150 0 10 0 1 0 F
+C -15 0 75 0 1 10 N
+S -200 200 200 -200 0 1 10 f
+P 2 0 1 10 -25 -70 -25 70 N
+P 2 0 1 10 -15 -70 -15 70 N
+P 2 0 1 10 -5 70 -5 -70 N
+P 3 0 1 0 -200 -100 -150 -100 -150 -80 N
+P 3 0 1 0 -200 100 -150 100 -150 80 N
+P 3 0 1 10 10 -120 -20 -110 5 -95 N
+P 3 0 1 10 10 115 -20 105 5 90 N
+P 4 0 1 0 -200 0 -150 0 -150 -40 -130 -80 N
+P 4 0 1 0 -170 0 -150 0 -150 40 -130 80 N
+X A A -300 100 100 R 50 50 1 1 P
+X B B -300 -100 100 R 50 50 1 1 P
+X C C -300 0 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # STM32F411RETx-MCU_ST_STM32F4
 #
 DEF STM32F411RETx-MCU_ST_STM32F4 U 0 20 Y Y 1 F N
@@ -403,6 +433,24 @@ X C 3 200 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# SW_SPDT-mouseComp
+#
+DEF SW_SPDT-mouseComp SW 0 0 Y N 1 F N
+F0 "SW" 0 170 50 H V C CNN
+F1 "SW_SPDT-mouseComp" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+C -80 0 20 0 0 0 N
+C 80 -100 20 0 0 0 N
+C 80 100 20 0 1 0 N
+P 2 0 1 0 -60 10 65 90 N
+X B 1 -200 0 100 R 50 50 1 1 P
+X C 2 200 -100 100 L 50 50 1 1 P
+X A 3 200 100 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # USBLC6-2SC6-Power_Protection
 #
 DEF USBLC6-2SC6-Power_Protection U 0 20 Y N 1 F N
diff --git a/HW/mouse/mouse.sch b/HW/mouse/mouse.sch
index a702f6e2ae4d2249cb0ade5113dfe232d3371eed..c7e78e8ac3645122d756a8e37b49018251f469e5 100644
--- a/HW/mouse/mouse.sch
+++ b/HW/mouse/mouse.sch
@@ -14,7 +14,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Device:C C4
+L mouse-rescue:C-Device C4
 U 1 1 600878EC
 P 2550 900
 F 0 "C4" H 2435 854 50  0000 R CNN
@@ -25,7 +25,7 @@ F 3 "~" H 2550 900 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:C C5
+L mouse-rescue:C-Device C5
 U 1 1 6008860D
 P 2950 900
 F 0 "C5" H 3065 946 50  0000 L CNN
@@ -36,7 +36,7 @@ F 3 "~" H 2950 900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C6
+L mouse-rescue:C-Device C6
 U 1 1 6008ACD5
 P 3350 900
 F 0 "C6" H 3465 946 50  0000 L CNN
@@ -47,7 +47,7 @@ F 3 "~" H 3350 900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C7
+L mouse-rescue:C-Device C7
 U 1 1 6008ACDB
 P 3750 900
 F 0 "C7" H 3865 946 50  0000 L CNN
@@ -117,7 +117,7 @@ Connection ~ 2400 4950
 Wire Wire Line
 	2400 4950 2500 4950
 $Comp
-L power:GND #PWR05
+L mouse-rescue:GND-power #PWR05
 U 1 1 600B6DA8
 P 2300 4950
 F 0 "#PWR05" H 2300 4700 50  0001 C CNN
@@ -151,7 +151,7 @@ Wire Wire Line
 	1150 2900 1000 2900
 Connection ~ 1150 2900
 $Comp
-L power:GND #PWR01
+L mouse-rescue:GND-power #PWR01
 U 1 1 600CFDFE
 P 700 2600
 F 0 "#PWR01" H 700 2350 50  0001 C CNN
@@ -162,7 +162,7 @@ F 3 "" H 700 2600 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L power:GND #PWR02
+L mouse-rescue:GND-power #PWR02
 U 1 1 600D18F2
 P 700 2900
 F 0 "#PWR02" H 700 2650 50  0001 C CNN
@@ -175,7 +175,7 @@ $EndComp
 Wire Wire Line
 	4150 750  4550 750 
 $Comp
-L power:GND #PWR07
+L mouse-rescue:GND-power #PWR07
 U 1 1 60093E81
 P 3650 2700
 F 0 "#PWR07" H 3650 2450 50  0001 C CNN
@@ -186,7 +186,7 @@ F 3 "" H 3650 2700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR06
+L mouse-rescue:+3.3V-power #PWR06
 U 1 1 60092F6A
 P 4550 750
 F 0 "#PWR06" H 4550 600 50  0001 C CNN
@@ -197,7 +197,7 @@ F 3 "" H 4550 750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C8
+L mouse-rescue:C-Device C8
 U 1 1 6008BB07
 P 4150 900
 F 0 "C8" H 4265 946 50  0000 L CNN
@@ -215,7 +215,7 @@ Wire Wire Line
 	4150 1050 3750 1050
 Connection ~ 3750 1050
 $Comp
-L Device:C C1
+L mouse-rescue:C-Device C1
 U 1 1 600C9F4E
 P 850 2600
 F 0 "C1" V 700 2600 50  0000 R CNN
@@ -226,7 +226,7 @@ F 3 "~" H 850 2600 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:C C2
+L mouse-rescue:C-Device C2
 U 1 1 600CB6FB
 P 850 2900
 F 0 "C2" V 1050 2850 50  0000 R CNN
@@ -237,7 +237,7 @@ F 3 "~" H 850 2900 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:Crystal Y1
+L mouse-rescue:Crystal-Device Y1
 U 1 1 600C3655
 P 1150 2750
 F 0 "Y1" V 1104 2881 50  0000 L CNN
@@ -248,7 +248,7 @@ F 3 "~" H 1150 2750 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Connector:Conn_01x06_Male J1
+L mouse-rescue:Conn_01x06_Male-Connector J1
 U 1 1 600D4602
 P 4250 2650
 F 0 "J1" H 4222 2624 50  0000 R CNN
@@ -259,7 +259,7 @@ F 3 "~" H 4250 2650 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR09
+L mouse-rescue:+3.3V-power #PWR09
 U 1 1 600EA970
 P 3950 2450
 F 0 "#PWR09" H 3950 2300 50  0001 C CNN
@@ -290,7 +290,7 @@ SWO
 Text GLabel 3000 2200 2    50   BiDi ~ 0
 SWDIO
 $Comp
-L Device:C C9
+L mouse-rescue:C-Device C9
 U 1 1 600F395C
 P 4300 1700
 F 0 "C9" H 4415 1746 50  0000 L CNN
@@ -301,7 +301,7 @@ F 3 "~" H 4300 1700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Switch:SW_Push SW1
+L mouse-rescue:SW_Push-Switch SW1
 U 1 1 600F67B3
 P 3700 1650
 F 0 "SW1" V 3654 1798 50  0000 L CNN
@@ -312,7 +312,7 @@ F 3 "~" H 3700 1850 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L power:GND #PWR010
+L mouse-rescue:GND-power #PWR010
 U 1 1 60101F14
 P 4000 1900
 F 0 "#PWR010" H 4000 1650 50  0001 C CNN
@@ -335,7 +335,7 @@ Connection ~ 4150 1050
 Connection ~ 4550 750 
 Connection ~ 4550 1050
 $Comp
-L power:GND #PWR011
+L mouse-rescue:GND-power #PWR011
 U 1 1 600FE98E
 P 4550 1050
 F 0 "#PWR011" H 4550 800 50  0001 C CNN
@@ -346,7 +346,7 @@ F 3 "" H 4550 1050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C10
+L mouse-rescue:C-Device C10
 U 1 1 6008BB0D
 P 4550 900
 F 0 "C10" H 4665 946 50  0000 L CNN
@@ -359,7 +359,7 @@ $EndComp
 Wire Wire Line
 	4150 1050 4550 1050
 $Comp
-L Device:C C20
+L mouse-rescue:C-Device C20
 U 1 1 601412DD
 P 10500 1450
 F 0 "C20" H 10615 1496 50  0000 L CNN
@@ -370,7 +370,7 @@ F 3 "~" H 10500 1450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR027
+L mouse-rescue:+3.3V-power #PWR027
 U 1 1 60146CF8
 P 10500 1050
 F 0 "#PWR027" H 10500 900 50  0001 C CNN
@@ -384,7 +384,7 @@ Wire Wire Line
 	10500 1050 10500 1100
 Connection ~ 10500 1100
 $Comp
-L Regulator_Linear:MIC5205-3.0YM5 U4
+L mouse-rescue:MIC5205-3.0YM5-Regulator_Linear U4
 U 1 1 600AF3EA
 P 9450 2400
 F 0 "U4" H 9450 2742 50  0000 C CNN
@@ -395,7 +395,7 @@ F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20005785A.pdf" H 9450 2400
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C17
+L mouse-rescue:C-Device C17
 U 1 1 600B53C5
 P 8900 2650
 F 0 "C17" H 9015 2696 50  0000 L CNN
@@ -406,7 +406,7 @@ F 3 "~" H 8900 2650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C19
+L mouse-rescue:C-Device C19
 U 1 1 600BB9F4
 P 10550 2650
 F 0 "C19" H 10665 2696 50  0000 L CNN
@@ -426,7 +426,7 @@ Wire Wire Line
 	9050 2300 8900 2300
 Connection ~ 9050 2300
 $Comp
-L Device:R R2
+L mouse-rescue:R-Device R2
 U 1 1 600C4CBF
 P 9900 2450
 F 0 "R2" H 9950 2500 50  0000 L CNN
@@ -437,7 +437,7 @@ F 3 "~" H 9900 2450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R R3
+L mouse-rescue:R-Device R3
 U 1 1 600C5BBB
 P 9900 2850
 F 0 "R3" H 10000 2900 50  0000 L CNN
@@ -459,7 +459,7 @@ Connection ~ 9900 2650
 Wire Wire Line
 	9750 2300 9900 2300
 $Comp
-L power:GND #PWR023
+L mouse-rescue:GND-power #PWR023
 U 1 1 600D13FD
 P 9450 3000
 F 0 "#PWR023" H 9450 2750 50  0001 C CNN
@@ -485,7 +485,7 @@ Connection ~ 9450 3000
 Wire Wire Line
 	9900 3000 9450 3000
 $Comp
-L power:+5V #PWR022
+L mouse-rescue:+5V-power #PWR022
 U 1 1 600F8511
 P 8900 2300
 F 0 "#PWR022" H 8900 2150 50  0001 C CNN
@@ -496,7 +496,7 @@ F 3 "" H 8900 2300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:VCC #PWR026
+L mouse-rescue:VCC-power #PWR026
 U 1 1 600FFD9C
 P 10550 2300
 F 0 "#PWR026" H 10550 2150 50  0001 C CNN
@@ -515,7 +515,7 @@ Wire Wire Line
 Wire Wire Line
 	10550 3000 10550 2800
 $Comp
-L Device:LED D1
+L mouse-rescue:LED-Device D1
 U 1 1 601355C7
 P 10250 2750
 F 0 "D1" V 10289 2632 50  0000 R CNN
@@ -526,7 +526,7 @@ F 3 "~" H 10250 2750 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R R4
+L mouse-rescue:R-Device R4
 U 1 1 6013719E
 P 10250 2450
 F 0 "R4" H 10300 2500 50  0000 L CNN
@@ -544,7 +544,7 @@ Wire Wire Line
 Connection ~ 9900 2300
 Connection ~ 9900 3000
 $Comp
-L Device:LED D2
+L mouse-rescue:LED-Device D2
 U 1 1 6014C1EC
 P 10150 1550
 F 0 "D2" V 10189 1432 50  0000 R CNN
@@ -555,7 +555,7 @@ F 3 "~" H 10150 1550 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R R5
+L mouse-rescue:R-Device R5
 U 1 1 6014C1F4
 P 10150 1250
 F 0 "R5" H 10200 1300 50  0000 L CNN
@@ -600,7 +600,7 @@ SCLK
 Text GLabel 1600 3200 0    50   Input ~ 0
 MOTION
 $Comp
-L power:VCC #PWR013
+L mouse-rescue:VCC-power #PWR013
 U 1 1 601BD039
 P 1300 6550
 F 0 "#PWR013" H 1300 6400 50  0001 C CNN
@@ -612,7 +612,7 @@ F 4 "+1.9V" H 1315 6723 50  0000 C CNN "Value2"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C12
+L mouse-rescue:C-Device C12
 U 1 1 601DA26F
 P 1300 6700
 F 0 "C12" H 1415 6746 50  0000 L CNN
@@ -623,7 +623,7 @@ F 3 "~" H 1300 6700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR018
+L mouse-rescue:GND-power #PWR018
 U 1 1 601DC327
 P 1850 7300
 F 0 "#PWR018" H 1850 7050 50  0001 C CNN
@@ -638,7 +638,7 @@ Wire Wire Line
 Wire Wire Line
 	1850 7150 1950 7150
 $Comp
-L Device:C C11
+L mouse-rescue:C-Device C11
 U 1 1 601F005F
 P 1050 6100
 F 0 "C11" H 1165 6146 50  0000 L CNN
@@ -653,7 +653,7 @@ Wire Wire Line
 Wire Wire Line
 	1750 6750 1950 6750
 $Comp
-L power:+3.3V #PWR012
+L mouse-rescue:+3.3V-power #PWR012
 U 1 1 60200A00
 P 1500 7150
 F 0 "#PWR012" H 1500 7000 50  0001 C CNN
@@ -664,7 +664,7 @@ F 3 "" H 1500 7150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR016
+L mouse-rescue:GND-power #PWR016
 U 1 1 6021A10F
 P 1300 6850
 F 0 "#PWR016" H 1300 6600 50  0001 C CNN
@@ -675,7 +675,7 @@ F 3 "" H 1300 6850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C13
+L mouse-rescue:C-Device C13
 U 1 1 6021D9D7
 P 1500 7300
 F 0 "C13" H 1615 7346 50  0000 L CNN
@@ -686,7 +686,7 @@ F 3 "~" H 1500 7300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR014
+L mouse-rescue:GND-power #PWR014
 U 1 1 60229016
 P 1500 7450
 F 0 "#PWR014" H 1500 7200 50  0001 C CNN
@@ -697,7 +697,7 @@ F 3 "" H 1500 7450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C3
+L mouse-rescue:C-Device C3
 U 1 1 6024447F
 P 1400 2200
 F 0 "C3" H 1285 2154 50  0000 R CNN
@@ -712,7 +712,7 @@ Wire Wire Line
 Wire Wire Line
 	1400 2000 1600 2000
 $Comp
-L power:GND #PWR08
+L mouse-rescue:GND-power #PWR08
 U 1 1 6025058F
 P 1400 2350
 F 0 "#PWR08" H 1400 2100 50  0001 C CNN
@@ -725,7 +725,7 @@ $EndComp
 Wire Wire Line
 	10500 1600 10500 1800
 $Comp
-L Connector:Conn_01x01_Male J6
+L mouse-rescue:Conn_01x01_Male-Connector J6
 U 1 1 6027468B
 P 3200 7150
 F 0 "J6" H 3000 7000 50  0000 C CNN
@@ -736,7 +736,7 @@ F 3 "~" H 3200 7150 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Connector:Conn_01x01_Male J5
+L mouse-rescue:Conn_01x01_Male-Connector J5
 U 1 1 6027F21E
 P 3350 7250
 F 0 "J5" H 3150 7100 50  0000 C CNN
@@ -755,7 +755,7 @@ D-
 Text GLabel 6700 850  1    50   BiDi ~ 0
 D+
 $Comp
-L power:GND #PWR021
+L mouse-rescue:GND-power #PWR021
 U 1 1 603B0C71
 P 6200 1250
 F 0 "#PWR021" H 6200 1000 50  0001 C CNN
@@ -766,7 +766,7 @@ F 3 "" H 6200 1250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C21
+L mouse-rescue:C-Device C21
 U 1 1 603D5C8D
 P 7250 1400
 F 0 "C21" H 7365 1446 50  0000 L CNN
@@ -777,7 +777,7 @@ F 3 "~" H 7250 1400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR028
+L mouse-rescue:GND-power #PWR028
 U 1 1 603D5C87
 P 7250 1550
 F 0 "#PWR028" H 7250 1300 50  0001 C CNN
@@ -788,7 +788,7 @@ F 3 "" H 7250 1550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+5V #PWR020
+L mouse-rescue:+5V-power #PWR020
 U 1 1 60345C17
 P 7250 1250
 F 0 "#PWR020" H 7250 1100 50  0001 C CNN
@@ -799,7 +799,7 @@ F 3 "" H 7250 1250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Power_Protection:USBLC6-2SC6 U3
+L mouse-rescue:USBLC6-2SC6-Power_Protection U3
 U 1 1 601BA7C5
 P 6600 1250
 F 0 "U3" H 6850 1700 50  0000 C CNN
@@ -848,7 +848,7 @@ Wire Wire Line
 	9750 1800 10150 1800
 Connection ~ 9750 1800
 $Comp
-L power:GND #PWR025
+L mouse-rescue:GND-power #PWR025
 U 1 1 6014556B
 P 9750 1800
 F 0 "#PWR025" H 9750 1550 50  0001 C CNN
@@ -861,7 +861,7 @@ $EndComp
 Wire Wire Line
 	9000 1800 9300 1800
 $Comp
-L Connector:Conn_01x01_Male J4
+L mouse-rescue:Conn_01x01_Male-Connector J4
 U 1 1 601302EE
 P 8800 1700
 F 0 "J4" H 8800 1650 50  0000 C CNN
@@ -882,7 +882,7 @@ Wire Wire Line
 Wire Wire Line
 	9000 1700 9000 1800
 $Comp
-L power:+5V #PWR024
+L mouse-rescue:+5V-power #PWR024
 U 1 1 6014A6DA
 P 9000 1050
 F 0 "#PWR024" H 9000 900 50  0001 C CNN
@@ -893,7 +893,7 @@ F 3 "" H 9000 1050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C18
+L mouse-rescue:C-Device C18
 U 1 1 6013FC2B
 P 9000 1450
 F 0 "C18" H 9115 1496 50  0000 L CNN
@@ -904,7 +904,7 @@ F 3 "~" H 9000 1450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR04
+L mouse-rescue:GND-power #PWR04
 U 1 1 600B6DB4
 P 1150 2200
 F 0 "#PWR04" H 1150 1950 50  0001 C CNN
@@ -915,7 +915,7 @@ F 3 "" H 1150 2200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R R1
+L mouse-rescue:R-Device R1
 U 1 1 600C5A46
 P 1150 2050
 F 0 "R1" H 950 2100 50  0000 L CNN
@@ -926,7 +926,7 @@ F 3 "~" H 1150 2050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR03
+L mouse-rescue:+3.3V-power #PWR03
 U 1 1 600B5332
 P 1150 1150
 F 0 "#PWR03" H 1150 1000 50  0001 C CNN
@@ -941,7 +941,7 @@ NRST
 Wire Wire Line
 	1800 6650 1950 6650
 $Comp
-L Device:LED D3
+L mouse-rescue:LED-Device D3
 U 1 1 60107AD8
 P 9300 1550
 F 0 "D3" V 9339 1432 50  0000 R CNN
@@ -952,7 +952,7 @@ F 3 "~" H 9300 1550 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R R7
+L mouse-rescue:R-Device R7
 U 1 1 60107ADE
 P 9300 1250
 F 0 "R7" H 9350 1300 50  0000 L CNN
@@ -973,7 +973,7 @@ Connection ~ 9300 1800
 Wire Wire Line
 	9300 1800 9750 1800
 $Comp
-L power:GND #PWR0101
+L mouse-rescue:GND-power #PWR0101
 U 1 1 6012A71D
 P 4400 6450
 F 0 "#PWR0101" H 4400 6200 50  0001 C CNN
@@ -984,7 +984,7 @@ F 3 "" H 4400 6450 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:C C23
+L mouse-rescue:C-Device C23
 U 1 1 6012A70C
 P 4400 6300
 F 0 "C23" H 4515 6346 50  0000 L CNN
@@ -996,7 +996,7 @@ F 3 "~" H 4400 6300 50  0001 C CNN
 $EndComp
 Connection ~ 4400 6150
 $Comp
-L power:VCC #PWR0102
+L mouse-rescue:VCC-power #PWR0102
 U 1 1 6012A706
 P 4400 6150
 F 0 "#PWR0102" H 4400 6000 50  0001 C CNN
@@ -1015,7 +1015,7 @@ Wire Wire Line
 	2850 6850 2950 6850
 Connection ~ 2950 6850
 $Comp
-L Device:R R6
+L mouse-rescue:R-Device R6
 U 1 1 60166BF7
 P 2950 5950
 F 0 "R6" H 2750 6000 50  0000 L CNN
@@ -1026,7 +1026,7 @@ F 3 "~" H 2950 5950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0103
+L mouse-rescue:+3.3V-power #PWR0103
 U 1 1 6016ADFD
 P 2950 5800
 F 0 "#PWR0103" H 2950 5650 50  0001 C CNN
@@ -1037,7 +1037,7 @@ F 3 "" H 2950 5800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L MCU_ST_STM32F4:STM32F411RETx U1
+L mouse-rescue:STM32F411RETx-MCU_ST_STM32F4 U1
 U 1 1 6008631E
 P 2300 3100
 F 0 "U1" H 2300 3200 50  0000 C CNN
@@ -1052,7 +1052,7 @@ Wire Wire Line
 Wire Wire Line
 	10550 2300 10550 2500
 $Comp
-L Connector:Conn_01x01_Male J7
+L mouse-rescue:Conn_01x01_Male-Connector J7
 U 1 1 601D67DA
 P 3250 6650
 F 0 "J7" H 3050 6500 50  0000 C CNN
@@ -1063,7 +1063,7 @@ F 3 "~" H 3250 6650 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Connector:Conn_01x01_Male J8
+L mouse-rescue:Conn_01x01_Male-Connector J8
 U 1 1 601DABF3
 P 3350 6550
 F 0 "J8" H 3150 6600 50  0000 C CNN
@@ -1100,7 +1100,7 @@ Wire Wire Line
 Wire Wire Line
 	1150 1750 1150 1800
 $Comp
-L Device:Jumper JP1
+L mouse-rescue:Jumper-Device JP1
 U 1 1 601C903C
 P 1150 1450
 F 0 "JP1" V 1196 1362 50  0000 R CNN
@@ -1113,7 +1113,7 @@ $EndComp
 Wire Wire Line
 	1150 1800 1600 1800
 $Comp
-L power:GND #PWR017
+L mouse-rescue:GND-power #PWR017
 U 1 1 6012B032
 P 5800 1400
 F 0 "#PWR017" H 5800 1150 50  0001 C CNN
@@ -1124,7 +1124,7 @@ F 3 "" H 5800 1400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+5V #PWR019
+L mouse-rescue:+5V-power #PWR019
 U 1 1 6012CCCB
 P 5800 1000
 F 0 "#PWR019" H 5800 850 50  0001 C CNN
@@ -1138,7 +1138,7 @@ Wire Wire Line
 	5700 1000 5800 1000
 Connection ~ 4000 1900
 $Comp
-L Connector:Conn_01x05_Male J2
+L mouse-rescue:Conn_01x05_Male-Connector J2
 U 1 1 6023D59F
 P 5500 1200
 F 0 "J2" H 5608 1581 50  0000 C CNN
@@ -1181,7 +1181,7 @@ MCU\n
 Text Notes 600  5500 0    50   ~ 0
 Sensor\n
 $Comp
-L power:GND #PWR015
+L mouse-rescue:GND-power #PWR015
 U 1 1 60215126
 P 1050 6250
 F 0 "#PWR015" H 1050 6000 50  0001 C CNN
@@ -1237,7 +1237,7 @@ SMB1
 Text GLabel 5500 2550 0    50   Output ~ 0
 LMB
 $Comp
-L power:GND #PWR0111
+L mouse-rescue:GND-power #PWR0111
 U 1 1 6033B5A0
 P 6300 3000
 F 0 "#PWR0111" H 6300 2750 50  0001 C CNN
@@ -1250,7 +1250,7 @@ $EndComp
 Wire Wire Line
 	5800 2900 5850 2900
 $Comp
-L Device:C C14
+L mouse-rescue:C-Device C14
 U 1 1 60286212
 P 5500 2700
 F 0 "C14" H 5615 2746 50  0000 L CNN
@@ -1261,7 +1261,7 @@ F 3 "~" H 5500 2700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0104
+L mouse-rescue:+3.3V-power #PWR0104
 U 1 1 60261D84
 P 5800 2250
 F 0 "#PWR0104" H 5800 2100 50  0001 C CNN
@@ -1283,7 +1283,7 @@ F 3 "" H 2400 7400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Regulator_Linear:AP2127N-3.3 U5
+L mouse-rescue:AP2127N-3.3-Regulator_Linear U5
 U 1 1 601E6C96
 P 9750 1100
 F 0 "U5" H 9750 1342 50  0000 C CNN
@@ -1294,7 +1294,7 @@ F 3 "https://www.diodes.com/assets/Datasheets/AP2127.pdf" H 9750 1100 50  0001 C
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW4
+L mouse-rescue:SW_SPDT-mouseComp SW4
 U 1 1 601E71D4
 P 6050 2900
 F 0 "SW4" H 6050 3185 50  0000 C CNN
@@ -1310,7 +1310,7 @@ Wire Wire Line
 	1150 1900 1150 1800
 Connection ~ 1150 1800
 $Comp
-L Device:R R10
+L mouse-rescue:R-Device R10
 U 1 1 602DE7E7
 P 5800 2400
 F 0 "R10" H 5600 2450 50  0000 L CNN
@@ -1330,7 +1330,7 @@ Wire Wire Line
 Wire Wire Line
 	5800 2550 5500 2550
 $Comp
-L power:GND #PWR0105
+L mouse-rescue:GND-power #PWR0105
 U 1 1 6032BAA5
 P 5500 2850
 F 0 "#PWR0105" H 5500 2600 50  0001 C CNN
@@ -1349,7 +1349,7 @@ Wire Notes Line
 Wire Notes Line
 	5150 500  5150 5300
 $Comp
-L power:GND #PWR0106
+L mouse-rescue:GND-power #PWR0106
 U 1 1 60395CFD
 P 7450 3050
 F 0 "#PWR0106" H 7450 2800 50  0001 C CNN
@@ -1362,7 +1362,7 @@ $EndComp
 Wire Wire Line
 	6950 2950 7000 2950
 $Comp
-L Device:C C24
+L mouse-rescue:C-Device C24
 U 1 1 60395D04
 P 6650 2750
 F 0 "C24" H 6765 2796 50  0000 L CNN
@@ -1373,7 +1373,7 @@ F 3 "~" H 6650 2750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0107
+L mouse-rescue:+3.3V-power #PWR0107
 U 1 1 60395D0A
 P 6950 2300
 F 0 "#PWR0107" H 6950 2150 50  0001 C CNN
@@ -1384,7 +1384,7 @@ F 3 "" H 6950 2300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW6
+L mouse-rescue:SW_SPDT-mouseComp SW6
 U 1 1 60395D10
 P 7200 2950
 F 0 "SW6" H 7200 3235 50  0000 C CNN
@@ -1397,7 +1397,7 @@ $EndComp
 Wire Wire Line
 	7450 3050 7400 3050
 $Comp
-L Device:R R12
+L mouse-rescue:R-Device R12
 U 1 1 60395D17
 P 6950 2450
 F 0 "R12" H 6750 2500 50  0000 L CNN
@@ -1417,7 +1417,7 @@ Wire Wire Line
 Wire Wire Line
 	6950 2600 6650 2600
 $Comp
-L power:GND #PWR0108
+L mouse-rescue:GND-power #PWR0108
 U 1 1 60395D22
 P 6650 2900
 F 0 "#PWR0108" H 6650 2650 50  0001 C CNN
@@ -1428,7 +1428,7 @@ F 3 "" H 6650 2900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0109
+L mouse-rescue:GND-power #PWR0109
 U 1 1 603A6A19
 P 6250 4200
 F 0 "#PWR0109" H 6250 3950 50  0001 C CNN
@@ -1441,7 +1441,7 @@ $EndComp
 Wire Wire Line
 	5750 4100 5800 4100
 $Comp
-L Device:C C16
+L mouse-rescue:C-Device C16
 U 1 1 603A6A20
 P 5450 3900
 F 0 "C16" H 5565 3946 50  0000 L CNN
@@ -1452,7 +1452,7 @@ F 3 "~" H 5450 3900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0110
+L mouse-rescue:+3.3V-power #PWR0110
 U 1 1 603A6A26
 P 5750 3450
 F 0 "#PWR0110" H 5750 3300 50  0001 C CNN
@@ -1463,7 +1463,7 @@ F 3 "" H 5750 3450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW3
+L mouse-rescue:SW_SPDT-mouseComp SW3
 U 1 1 603A6A2C
 P 6000 4100
 F 0 "SW3" H 6000 4385 50  0000 C CNN
@@ -1476,7 +1476,7 @@ $EndComp
 Wire Wire Line
 	6250 4200 6200 4200
 $Comp
-L Device:R R9
+L mouse-rescue:R-Device R9
 U 1 1 603A6A33
 P 5750 3600
 F 0 "R9" H 5550 3650 50  0000 L CNN
@@ -1496,7 +1496,7 @@ Wire Wire Line
 Wire Wire Line
 	5750 3750 5450 3750
 $Comp
-L power:GND #PWR0112
+L mouse-rescue:GND-power #PWR0112
 U 1 1 603A6A3E
 P 5450 4050
 F 0 "#PWR0112" H 5450 3800 50  0001 C CNN
@@ -1507,7 +1507,7 @@ F 3 "" H 5450 4050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0113
+L mouse-rescue:GND-power #PWR0113
 U 1 1 603B273A
 P 7600 4300
 F 0 "#PWR0113" H 7600 4050 50  0001 C CNN
@@ -1520,7 +1520,7 @@ $EndComp
 Wire Wire Line
 	7100 4200 7150 4200
 $Comp
-L Device:C C25
+L mouse-rescue:C-Device C25
 U 1 1 603B2741
 P 6800 4000
 F 0 "C25" H 6915 4046 50  0000 L CNN
@@ -1531,7 +1531,7 @@ F 3 "~" H 6800 4000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0114
+L mouse-rescue:+3.3V-power #PWR0114
 U 1 1 603B2747
 P 7100 3550
 F 0 "#PWR0114" H 7100 3400 50  0001 C CNN
@@ -1542,7 +1542,7 @@ F 3 "" H 7100 3550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW7
+L mouse-rescue:SW_SPDT-mouseComp SW7
 U 1 1 603B274D
 P 7350 4200
 F 0 "SW7" H 7350 4485 50  0000 C CNN
@@ -1555,7 +1555,7 @@ $EndComp
 Wire Wire Line
 	7600 4300 7550 4300
 $Comp
-L Device:R R13
+L mouse-rescue:R-Device R13
 U 1 1 603B2754
 P 7100 3700
 F 0 "R13" H 6900 3750 50  0000 L CNN
@@ -1575,7 +1575,7 @@ Wire Wire Line
 Wire Wire Line
 	7100 3850 6800 3850
 $Comp
-L power:GND #PWR0115
+L mouse-rescue:GND-power #PWR0115
 U 1 1 603B275F
 P 6800 4150
 F 0 "#PWR0115" H 6800 3900 50  0001 C CNN
@@ -1586,7 +1586,7 @@ F 3 "" H 6800 4150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0116
+L mouse-rescue:GND-power #PWR0116
 U 1 1 603B969B
 P 6400 5500
 F 0 "#PWR0116" H 6400 5250 50  0001 C CNN
@@ -1599,7 +1599,7 @@ $EndComp
 Wire Wire Line
 	5900 5400 5950 5400
 $Comp
-L power:+3.3V #PWR0117
+L mouse-rescue:+3.3V-power #PWR0117
 U 1 1 603B96A8
 P 5900 4750
 F 0 "#PWR0117" H 5900 4600 50  0001 C CNN
@@ -1610,7 +1610,7 @@ F 3 "" H 5900 4750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW5
+L mouse-rescue:SW_SPDT-mouseComp SW5
 U 1 1 603B96AE
 P 6150 5400
 F 0 "SW5" H 6150 5685 50  0000 C CNN
@@ -1623,7 +1623,7 @@ $EndComp
 Wire Wire Line
 	6400 5500 6350 5500
 $Comp
-L Device:R R11
+L mouse-rescue:R-Device R11
 U 1 1 603B96B5
 P 5900 4900
 F 0 "R11" H 5700 4950 50  0000 L CNN
@@ -1643,7 +1643,7 @@ Wire Wire Line
 Wire Wire Line
 	5900 5050 5600 5050
 $Comp
-L power:GND #PWR0118
+L mouse-rescue:GND-power #PWR0118
 U 1 1 603B96C0
 P 5600 5350
 F 0 "#PWR0118" H 5600 5100 50  0001 C CNN
@@ -1654,7 +1654,7 @@ F 3 "" H 5600 5350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0119
+L mouse-rescue:GND-power #PWR0119
 U 1 1 603C7883
 P 7650 5700
 F 0 "#PWR0119" H 7650 5450 50  0001 C CNN
@@ -1667,7 +1667,7 @@ $EndComp
 Wire Wire Line
 	7150 5600 7200 5600
 $Comp
-L Device:C C26
+L mouse-rescue:C-Device C26
 U 1 1 603C788A
 P 6850 5400
 F 0 "C26" H 6965 5446 50  0000 L CNN
@@ -1678,7 +1678,7 @@ F 3 "~" H 6850 5400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0120
+L mouse-rescue:+3.3V-power #PWR0120
 U 1 1 603C7890
 P 7150 4950
 F 0 "#PWR0120" H 7150 4800 50  0001 C CNN
@@ -1689,7 +1689,7 @@ F 3 "" H 7150 4950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW8
+L mouse-rescue:SW_SPDT-mouseComp SW8
 U 1 1 603C7896
 P 7400 5600
 F 0 "SW8" H 7400 5885 50  0000 C CNN
@@ -1702,7 +1702,7 @@ $EndComp
 Wire Wire Line
 	7650 5700 7600 5700
 $Comp
-L Device:R R14
+L mouse-rescue:R-Device R14
 U 1 1 603C789D
 P 7150 5100
 F 0 "R14" H 6950 5150 50  0000 L CNN
@@ -1722,7 +1722,7 @@ Wire Wire Line
 Wire Wire Line
 	7150 5250 6850 5250
 $Comp
-L power:GND #PWR0121
+L mouse-rescue:GND-power #PWR0121
 U 1 1 603C78A8
 P 6850 5550
 F 0 "#PWR0121" H 6850 5300 50  0001 C CNN
@@ -1733,7 +1733,7 @@ F 3 "" H 6850 5550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0122
+L mouse-rescue:GND-power #PWR0122
 U 1 1 603CFD3D
 P 6200 7000
 F 0 "#PWR0122" H 6200 6750 50  0001 C CNN
@@ -1746,7 +1746,7 @@ $EndComp
 Wire Wire Line
 	5700 6900 5750 6900
 $Comp
-L Device:C C15
+L mouse-rescue:C-Device C15
 U 1 1 603CFD44
 P 5400 6700
 F 0 "C15" H 5515 6746 50  0000 L CNN
@@ -1757,7 +1757,7 @@ F 3 "~" H 5400 6700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0123
+L mouse-rescue:+3.3V-power #PWR0123
 U 1 1 603CFD4A
 P 5700 6250
 F 0 "#PWR0123" H 5700 6100 50  0001 C CNN
@@ -1768,7 +1768,7 @@ F 3 "" H 5700 6250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW2
+L mouse-rescue:SW_SPDT-mouseComp SW2
 U 1 1 603CFD50
 P 5950 6900
 F 0 "SW2" H 5950 7185 50  0000 C CNN
@@ -1781,7 +1781,7 @@ $EndComp
 Wire Wire Line
 	6200 7000 6150 7000
 $Comp
-L Device:R R8
+L mouse-rescue:R-Device R8
 U 1 1 603CFD57
 P 5700 6400
 F 0 "R8" H 5500 6450 50  0000 L CNN
@@ -1801,7 +1801,7 @@ Wire Wire Line
 Wire Wire Line
 	5700 6550 5400 6550
 $Comp
-L power:GND #PWR0124
+L mouse-rescue:GND-power #PWR0124
 U 1 1 603CFD62
 P 5400 6850
 F 0 "#PWR0124" H 5400 6600 50  0001 C CNN
@@ -1812,7 +1812,7 @@ F 3 "" H 5400 6850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C22
+L mouse-rescue:C-Device C22
 U 1 1 603B96A2
 P 5600 5200
 F 0 "C22" H 5715 5246 50  0000 L CNN
@@ -1829,12 +1829,12 @@ Wire Notes Line
 Wire Notes Line
 	7900 3550 7900 6500
 $Comp
-L Device:Rotary_Encoder SW9
+L mouse-rescue:Rotary_Encoder-Device SW9
 U 1 1 602B655E
 P 9700 4850
 F 0 "SW9" H 9930 4896 50  0000 L CNN
 F 1 "Rotary_Encoder" H 9930 4805 50  0000 L CNN
-F 2 "" H 9550 5010 50  0001 C CNN
+F 2 "Encoder:EC10E" H 9550 5010 50  0001 C CNN
 F 3 "~" H 9700 5110 50  0001 C CNN
 	1    9700 4850
 	1    0    0    -1  
@@ -1842,7 +1842,7 @@ $EndComp
 Text Notes 8000 3700 0    50   ~ 0
 Scrool Wheel\n
 $Comp
-L power:GND #PWR0125
+L mouse-rescue:GND-power #PWR0125
 U 1 1 602C1889
 P 9100 4900
 F 0 "#PWR0125" H 9100 4650 50  0001 C CNN
@@ -1857,7 +1857,7 @@ Wire Wire Line
 Wire Wire Line
 	9100 4850 9100 4900
 $Comp
-L Device:C C27
+L mouse-rescue:C-Device C27
 U 1 1 602ECED8
 P 8700 4900
 F 0 "C27" H 8815 4946 50  0000 L CNN
@@ -1868,7 +1868,7 @@ F 3 "~" H 8700 4900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C28
+L mouse-rescue:C-Device C28
 U 1 1 602F4AA0
 P 9300 5450
 F 0 "C28" H 9415 5496 50  0000 L CNN
@@ -1881,7 +1881,7 @@ $EndComp
 Wire Wire Line
 	9400 4950 9300 4950
 $Comp
-L power:GND #PWR0126
+L mouse-rescue:GND-power #PWR0126
 U 1 1 6033F279
 P 8700 5050
 F 0 "#PWR0126" H 8700 4800 50  0001 C CNN
@@ -1892,7 +1892,7 @@ F 3 "" H 8700 5050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0127
+L mouse-rescue:GND-power #PWR0127
 U 1 1 603472FD
 P 9300 5600
 F 0 "#PWR0127" H 9300 5350 50  0001 C CNN
@@ -1903,7 +1903,7 @@ F 3 "" H 9300 5600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R R15
+L mouse-rescue:R-Device R15
 U 1 1 60358AA6
 P 9050 4750
 F 0 "R15" V 9150 4800 50  0000 L CNN
@@ -1914,7 +1914,7 @@ F 3 "~" H 9050 4750 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R R16
+L mouse-rescue:R-Device R16
 U 1 1 60369A85
 P 9300 5100
 F 0 "R16" H 9100 5150 50  0000 L CNN
diff --git a/HW/mouse/mouse.sch-bak b/HW/mouse/mouse.sch-bak
index c9a2a581143aa4b3a7b506f662c598330d627f0d..c7e78e8ac3645122d756a8e37b49018251f469e5 100644
--- a/HW/mouse/mouse.sch-bak
+++ b/HW/mouse/mouse.sch-bak
@@ -14,7 +14,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Device:C C4
+L mouse-rescue:C-Device C4
 U 1 1 600878EC
 P 2550 900
 F 0 "C4" H 2435 854 50  0000 R CNN
@@ -25,7 +25,7 @@ F 3 "~" H 2550 900 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:C C5
+L mouse-rescue:C-Device C5
 U 1 1 6008860D
 P 2950 900
 F 0 "C5" H 3065 946 50  0000 L CNN
@@ -36,7 +36,7 @@ F 3 "~" H 2950 900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C6
+L mouse-rescue:C-Device C6
 U 1 1 6008ACD5
 P 3350 900
 F 0 "C6" H 3465 946 50  0000 L CNN
@@ -47,7 +47,7 @@ F 3 "~" H 3350 900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C7
+L mouse-rescue:C-Device C7
 U 1 1 6008ACDB
 P 3750 900
 F 0 "C7" H 3865 946 50  0000 L CNN
@@ -117,7 +117,7 @@ Connection ~ 2400 4950
 Wire Wire Line
 	2400 4950 2500 4950
 $Comp
-L power:GND #PWR05
+L mouse-rescue:GND-power #PWR05
 U 1 1 600B6DA8
 P 2300 4950
 F 0 "#PWR05" H 2300 4700 50  0001 C CNN
@@ -151,7 +151,7 @@ Wire Wire Line
 	1150 2900 1000 2900
 Connection ~ 1150 2900
 $Comp
-L power:GND #PWR01
+L mouse-rescue:GND-power #PWR01
 U 1 1 600CFDFE
 P 700 2600
 F 0 "#PWR01" H 700 2350 50  0001 C CNN
@@ -162,7 +162,7 @@ F 3 "" H 700 2600 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L power:GND #PWR02
+L mouse-rescue:GND-power #PWR02
 U 1 1 600D18F2
 P 700 2900
 F 0 "#PWR02" H 700 2650 50  0001 C CNN
@@ -175,7 +175,7 @@ $EndComp
 Wire Wire Line
 	4150 750  4550 750 
 $Comp
-L power:GND #PWR07
+L mouse-rescue:GND-power #PWR07
 U 1 1 60093E81
 P 3650 2700
 F 0 "#PWR07" H 3650 2450 50  0001 C CNN
@@ -186,7 +186,7 @@ F 3 "" H 3650 2700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR06
+L mouse-rescue:+3.3V-power #PWR06
 U 1 1 60092F6A
 P 4550 750
 F 0 "#PWR06" H 4550 600 50  0001 C CNN
@@ -197,7 +197,7 @@ F 3 "" H 4550 750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C8
+L mouse-rescue:C-Device C8
 U 1 1 6008BB07
 P 4150 900
 F 0 "C8" H 4265 946 50  0000 L CNN
@@ -215,7 +215,7 @@ Wire Wire Line
 	4150 1050 3750 1050
 Connection ~ 3750 1050
 $Comp
-L Device:C C1
+L mouse-rescue:C-Device C1
 U 1 1 600C9F4E
 P 850 2600
 F 0 "C1" V 700 2600 50  0000 R CNN
@@ -226,7 +226,7 @@ F 3 "~" H 850 2600 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:C C2
+L mouse-rescue:C-Device C2
 U 1 1 600CB6FB
 P 850 2900
 F 0 "C2" V 1050 2850 50  0000 R CNN
@@ -237,7 +237,7 @@ F 3 "~" H 850 2900 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:Crystal Y1
+L mouse-rescue:Crystal-Device Y1
 U 1 1 600C3655
 P 1150 2750
 F 0 "Y1" V 1104 2881 50  0000 L CNN
@@ -248,7 +248,7 @@ F 3 "~" H 1150 2750 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Connector:Conn_01x06_Male J1
+L mouse-rescue:Conn_01x06_Male-Connector J1
 U 1 1 600D4602
 P 4250 2650
 F 0 "J1" H 4222 2624 50  0000 R CNN
@@ -259,7 +259,7 @@ F 3 "~" H 4250 2650 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR09
+L mouse-rescue:+3.3V-power #PWR09
 U 1 1 600EA970
 P 3950 2450
 F 0 "#PWR09" H 3950 2300 50  0001 C CNN
@@ -290,7 +290,7 @@ SWO
 Text GLabel 3000 2200 2    50   BiDi ~ 0
 SWDIO
 $Comp
-L Device:C C9
+L mouse-rescue:C-Device C9
 U 1 1 600F395C
 P 4300 1700
 F 0 "C9" H 4415 1746 50  0000 L CNN
@@ -301,7 +301,7 @@ F 3 "~" H 4300 1700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Switch:SW_Push SW1
+L mouse-rescue:SW_Push-Switch SW1
 U 1 1 600F67B3
 P 3700 1650
 F 0 "SW1" V 3654 1798 50  0000 L CNN
@@ -312,7 +312,7 @@ F 3 "~" H 3700 1850 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L power:GND #PWR010
+L mouse-rescue:GND-power #PWR010
 U 1 1 60101F14
 P 4000 1900
 F 0 "#PWR010" H 4000 1650 50  0001 C CNN
@@ -335,7 +335,7 @@ Connection ~ 4150 1050
 Connection ~ 4550 750 
 Connection ~ 4550 1050
 $Comp
-L power:GND #PWR011
+L mouse-rescue:GND-power #PWR011
 U 1 1 600FE98E
 P 4550 1050
 F 0 "#PWR011" H 4550 800 50  0001 C CNN
@@ -346,7 +346,7 @@ F 3 "" H 4550 1050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C10
+L mouse-rescue:C-Device C10
 U 1 1 6008BB0D
 P 4550 900
 F 0 "C10" H 4665 946 50  0000 L CNN
@@ -359,7 +359,7 @@ $EndComp
 Wire Wire Line
 	4150 1050 4550 1050
 $Comp
-L Device:C C20
+L mouse-rescue:C-Device C20
 U 1 1 601412DD
 P 10500 1450
 F 0 "C20" H 10615 1496 50  0000 L CNN
@@ -370,7 +370,7 @@ F 3 "~" H 10500 1450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR027
+L mouse-rescue:+3.3V-power #PWR027
 U 1 1 60146CF8
 P 10500 1050
 F 0 "#PWR027" H 10500 900 50  0001 C CNN
@@ -384,7 +384,7 @@ Wire Wire Line
 	10500 1050 10500 1100
 Connection ~ 10500 1100
 $Comp
-L Regulator_Linear:MIC5205-3.0YM5 U4
+L mouse-rescue:MIC5205-3.0YM5-Regulator_Linear U4
 U 1 1 600AF3EA
 P 9450 2400
 F 0 "U4" H 9450 2742 50  0000 C CNN
@@ -395,7 +395,7 @@ F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/20005785A.pdf" H 9450 2400
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C17
+L mouse-rescue:C-Device C17
 U 1 1 600B53C5
 P 8900 2650
 F 0 "C17" H 9015 2696 50  0000 L CNN
@@ -406,7 +406,7 @@ F 3 "~" H 8900 2650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C19
+L mouse-rescue:C-Device C19
 U 1 1 600BB9F4
 P 10550 2650
 F 0 "C19" H 10665 2696 50  0000 L CNN
@@ -426,7 +426,7 @@ Wire Wire Line
 	9050 2300 8900 2300
 Connection ~ 9050 2300
 $Comp
-L Device:R R2
+L mouse-rescue:R-Device R2
 U 1 1 600C4CBF
 P 9900 2450
 F 0 "R2" H 9950 2500 50  0000 L CNN
@@ -437,7 +437,7 @@ F 3 "~" H 9900 2450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R R3
+L mouse-rescue:R-Device R3
 U 1 1 600C5BBB
 P 9900 2850
 F 0 "R3" H 10000 2900 50  0000 L CNN
@@ -459,7 +459,7 @@ Connection ~ 9900 2650
 Wire Wire Line
 	9750 2300 9900 2300
 $Comp
-L power:GND #PWR023
+L mouse-rescue:GND-power #PWR023
 U 1 1 600D13FD
 P 9450 3000
 F 0 "#PWR023" H 9450 2750 50  0001 C CNN
@@ -485,7 +485,7 @@ Connection ~ 9450 3000
 Wire Wire Line
 	9900 3000 9450 3000
 $Comp
-L power:+5V #PWR022
+L mouse-rescue:+5V-power #PWR022
 U 1 1 600F8511
 P 8900 2300
 F 0 "#PWR022" H 8900 2150 50  0001 C CNN
@@ -496,7 +496,7 @@ F 3 "" H 8900 2300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:VCC #PWR026
+L mouse-rescue:VCC-power #PWR026
 U 1 1 600FFD9C
 P 10550 2300
 F 0 "#PWR026" H 10550 2150 50  0001 C CNN
@@ -515,7 +515,7 @@ Wire Wire Line
 Wire Wire Line
 	10550 3000 10550 2800
 $Comp
-L Device:LED D1
+L mouse-rescue:LED-Device D1
 U 1 1 601355C7
 P 10250 2750
 F 0 "D1" V 10289 2632 50  0000 R CNN
@@ -526,7 +526,7 @@ F 3 "~" H 10250 2750 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R R4
+L mouse-rescue:R-Device R4
 U 1 1 6013719E
 P 10250 2450
 F 0 "R4" H 10300 2500 50  0000 L CNN
@@ -544,7 +544,7 @@ Wire Wire Line
 Connection ~ 9900 2300
 Connection ~ 9900 3000
 $Comp
-L Device:LED D2
+L mouse-rescue:LED-Device D2
 U 1 1 6014C1EC
 P 10150 1550
 F 0 "D2" V 10189 1432 50  0000 R CNN
@@ -555,7 +555,7 @@ F 3 "~" H 10150 1550 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R R5
+L mouse-rescue:R-Device R5
 U 1 1 6014C1F4
 P 10150 1250
 F 0 "R5" H 10200 1300 50  0000 L CNN
@@ -600,7 +600,7 @@ SCLK
 Text GLabel 1600 3200 0    50   Input ~ 0
 MOTION
 $Comp
-L power:VCC #PWR013
+L mouse-rescue:VCC-power #PWR013
 U 1 1 601BD039
 P 1300 6550
 F 0 "#PWR013" H 1300 6400 50  0001 C CNN
@@ -612,7 +612,7 @@ F 4 "+1.9V" H 1315 6723 50  0000 C CNN "Value2"
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C12
+L mouse-rescue:C-Device C12
 U 1 1 601DA26F
 P 1300 6700
 F 0 "C12" H 1415 6746 50  0000 L CNN
@@ -623,7 +623,7 @@ F 3 "~" H 1300 6700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR018
+L mouse-rescue:GND-power #PWR018
 U 1 1 601DC327
 P 1850 7300
 F 0 "#PWR018" H 1850 7050 50  0001 C CNN
@@ -638,7 +638,7 @@ Wire Wire Line
 Wire Wire Line
 	1850 7150 1950 7150
 $Comp
-L Device:C C11
+L mouse-rescue:C-Device C11
 U 1 1 601F005F
 P 1050 6100
 F 0 "C11" H 1165 6146 50  0000 L CNN
@@ -653,7 +653,7 @@ Wire Wire Line
 Wire Wire Line
 	1750 6750 1950 6750
 $Comp
-L power:+3.3V #PWR012
+L mouse-rescue:+3.3V-power #PWR012
 U 1 1 60200A00
 P 1500 7150
 F 0 "#PWR012" H 1500 7000 50  0001 C CNN
@@ -664,7 +664,7 @@ F 3 "" H 1500 7150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR016
+L mouse-rescue:GND-power #PWR016
 U 1 1 6021A10F
 P 1300 6850
 F 0 "#PWR016" H 1300 6600 50  0001 C CNN
@@ -675,7 +675,7 @@ F 3 "" H 1300 6850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C13
+L mouse-rescue:C-Device C13
 U 1 1 6021D9D7
 P 1500 7300
 F 0 "C13" H 1615 7346 50  0000 L CNN
@@ -686,7 +686,7 @@ F 3 "~" H 1500 7300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR014
+L mouse-rescue:GND-power #PWR014
 U 1 1 60229016
 P 1500 7450
 F 0 "#PWR014" H 1500 7200 50  0001 C CNN
@@ -697,7 +697,7 @@ F 3 "" H 1500 7450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C3
+L mouse-rescue:C-Device C3
 U 1 1 6024447F
 P 1400 2200
 F 0 "C3" H 1285 2154 50  0000 R CNN
@@ -712,7 +712,7 @@ Wire Wire Line
 Wire Wire Line
 	1400 2000 1600 2000
 $Comp
-L power:GND #PWR08
+L mouse-rescue:GND-power #PWR08
 U 1 1 6025058F
 P 1400 2350
 F 0 "#PWR08" H 1400 2100 50  0001 C CNN
@@ -725,7 +725,7 @@ $EndComp
 Wire Wire Line
 	10500 1600 10500 1800
 $Comp
-L Connector:Conn_01x01_Male J6
+L mouse-rescue:Conn_01x01_Male-Connector J6
 U 1 1 6027468B
 P 3200 7150
 F 0 "J6" H 3000 7000 50  0000 C CNN
@@ -736,7 +736,7 @@ F 3 "~" H 3200 7150 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Connector:Conn_01x01_Male J5
+L mouse-rescue:Conn_01x01_Male-Connector J5
 U 1 1 6027F21E
 P 3350 7250
 F 0 "J5" H 3150 7100 50  0000 C CNN
@@ -755,7 +755,7 @@ D-
 Text GLabel 6700 850  1    50   BiDi ~ 0
 D+
 $Comp
-L power:GND #PWR021
+L mouse-rescue:GND-power #PWR021
 U 1 1 603B0C71
 P 6200 1250
 F 0 "#PWR021" H 6200 1000 50  0001 C CNN
@@ -766,7 +766,7 @@ F 3 "" H 6200 1250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C21
+L mouse-rescue:C-Device C21
 U 1 1 603D5C8D
 P 7250 1400
 F 0 "C21" H 7365 1446 50  0000 L CNN
@@ -777,7 +777,7 @@ F 3 "~" H 7250 1400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR028
+L mouse-rescue:GND-power #PWR028
 U 1 1 603D5C87
 P 7250 1550
 F 0 "#PWR028" H 7250 1300 50  0001 C CNN
@@ -788,7 +788,7 @@ F 3 "" H 7250 1550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+5V #PWR020
+L mouse-rescue:+5V-power #PWR020
 U 1 1 60345C17
 P 7250 1250
 F 0 "#PWR020" H 7250 1100 50  0001 C CNN
@@ -799,7 +799,7 @@ F 3 "" H 7250 1250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Power_Protection:USBLC6-2SC6 U3
+L mouse-rescue:USBLC6-2SC6-Power_Protection U3
 U 1 1 601BA7C5
 P 6600 1250
 F 0 "U3" H 6850 1700 50  0000 C CNN
@@ -848,7 +848,7 @@ Wire Wire Line
 	9750 1800 10150 1800
 Connection ~ 9750 1800
 $Comp
-L power:GND #PWR025
+L mouse-rescue:GND-power #PWR025
 U 1 1 6014556B
 P 9750 1800
 F 0 "#PWR025" H 9750 1550 50  0001 C CNN
@@ -861,7 +861,7 @@ $EndComp
 Wire Wire Line
 	9000 1800 9300 1800
 $Comp
-L Connector:Conn_01x01_Male J4
+L mouse-rescue:Conn_01x01_Male-Connector J4
 U 1 1 601302EE
 P 8800 1700
 F 0 "J4" H 8800 1650 50  0000 C CNN
@@ -882,7 +882,7 @@ Wire Wire Line
 Wire Wire Line
 	9000 1700 9000 1800
 $Comp
-L power:+5V #PWR024
+L mouse-rescue:+5V-power #PWR024
 U 1 1 6014A6DA
 P 9000 1050
 F 0 "#PWR024" H 9000 900 50  0001 C CNN
@@ -893,7 +893,7 @@ F 3 "" H 9000 1050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C18
+L mouse-rescue:C-Device C18
 U 1 1 6013FC2B
 P 9000 1450
 F 0 "C18" H 9115 1496 50  0000 L CNN
@@ -904,7 +904,7 @@ F 3 "~" H 9000 1450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR04
+L mouse-rescue:GND-power #PWR04
 U 1 1 600B6DB4
 P 1150 2200
 F 0 "#PWR04" H 1150 1950 50  0001 C CNN
@@ -915,7 +915,7 @@ F 3 "" H 1150 2200 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R R1
+L mouse-rescue:R-Device R1
 U 1 1 600C5A46
 P 1150 2050
 F 0 "R1" H 950 2100 50  0000 L CNN
@@ -926,7 +926,7 @@ F 3 "~" H 1150 2050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR03
+L mouse-rescue:+3.3V-power #PWR03
 U 1 1 600B5332
 P 1150 1150
 F 0 "#PWR03" H 1150 1000 50  0001 C CNN
@@ -941,7 +941,7 @@ NRST
 Wire Wire Line
 	1800 6650 1950 6650
 $Comp
-L Device:LED D3
+L mouse-rescue:LED-Device D3
 U 1 1 60107AD8
 P 9300 1550
 F 0 "D3" V 9339 1432 50  0000 R CNN
@@ -952,7 +952,7 @@ F 3 "~" H 9300 1550 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R R7
+L mouse-rescue:R-Device R7
 U 1 1 60107ADE
 P 9300 1250
 F 0 "R7" H 9350 1300 50  0000 L CNN
@@ -973,7 +973,7 @@ Connection ~ 9300 1800
 Wire Wire Line
 	9300 1800 9750 1800
 $Comp
-L power:GND #PWR0101
+L mouse-rescue:GND-power #PWR0101
 U 1 1 6012A71D
 P 4400 6450
 F 0 "#PWR0101" H 4400 6200 50  0001 C CNN
@@ -984,7 +984,7 @@ F 3 "" H 4400 6450 50  0001 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L Device:C C23
+L mouse-rescue:C-Device C23
 U 1 1 6012A70C
 P 4400 6300
 F 0 "C23" H 4515 6346 50  0000 L CNN
@@ -996,7 +996,7 @@ F 3 "~" H 4400 6300 50  0001 C CNN
 $EndComp
 Connection ~ 4400 6150
 $Comp
-L power:VCC #PWR0102
+L mouse-rescue:VCC-power #PWR0102
 U 1 1 6012A706
 P 4400 6150
 F 0 "#PWR0102" H 4400 6000 50  0001 C CNN
@@ -1015,7 +1015,7 @@ Wire Wire Line
 	2850 6850 2950 6850
 Connection ~ 2950 6850
 $Comp
-L Device:R R6
+L mouse-rescue:R-Device R6
 U 1 1 60166BF7
 P 2950 5950
 F 0 "R6" H 2750 6000 50  0000 L CNN
@@ -1026,7 +1026,7 @@ F 3 "~" H 2950 5950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0103
+L mouse-rescue:+3.3V-power #PWR0103
 U 1 1 6016ADFD
 P 2950 5800
 F 0 "#PWR0103" H 2950 5650 50  0001 C CNN
@@ -1037,7 +1037,7 @@ F 3 "" H 2950 5800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L MCU_ST_STM32F4:STM32F411RETx U1
+L mouse-rescue:STM32F411RETx-MCU_ST_STM32F4 U1
 U 1 1 6008631E
 P 2300 3100
 F 0 "U1" H 2300 3200 50  0000 C CNN
@@ -1052,7 +1052,7 @@ Wire Wire Line
 Wire Wire Line
 	10550 2300 10550 2500
 $Comp
-L Connector:Conn_01x01_Male J7
+L mouse-rescue:Conn_01x01_Male-Connector J7
 U 1 1 601D67DA
 P 3250 6650
 F 0 "J7" H 3050 6500 50  0000 C CNN
@@ -1063,7 +1063,7 @@ F 3 "~" H 3250 6650 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Connector:Conn_01x01_Male J8
+L mouse-rescue:Conn_01x01_Male-Connector J8
 U 1 1 601DABF3
 P 3350 6550
 F 0 "J8" H 3150 6600 50  0000 C CNN
@@ -1100,7 +1100,7 @@ Wire Wire Line
 Wire Wire Line
 	1150 1750 1150 1800
 $Comp
-L Device:Jumper JP1
+L mouse-rescue:Jumper-Device JP1
 U 1 1 601C903C
 P 1150 1450
 F 0 "JP1" V 1196 1362 50  0000 R CNN
@@ -1113,7 +1113,7 @@ $EndComp
 Wire Wire Line
 	1150 1800 1600 1800
 $Comp
-L power:GND #PWR017
+L mouse-rescue:GND-power #PWR017
 U 1 1 6012B032
 P 5800 1400
 F 0 "#PWR017" H 5800 1150 50  0001 C CNN
@@ -1124,7 +1124,7 @@ F 3 "" H 5800 1400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+5V #PWR019
+L mouse-rescue:+5V-power #PWR019
 U 1 1 6012CCCB
 P 5800 1000
 F 0 "#PWR019" H 5800 850 50  0001 C CNN
@@ -1138,7 +1138,7 @@ Wire Wire Line
 	5700 1000 5800 1000
 Connection ~ 4000 1900
 $Comp
-L Connector:Conn_01x05_Male J2
+L mouse-rescue:Conn_01x05_Male-Connector J2
 U 1 1 6023D59F
 P 5500 1200
 F 0 "J2" H 5608 1581 50  0000 C CNN
@@ -1181,7 +1181,7 @@ MCU\n
 Text Notes 600  5500 0    50   ~ 0
 Sensor\n
 $Comp
-L power:GND #PWR015
+L mouse-rescue:GND-power #PWR015
 U 1 1 60215126
 P 1050 6250
 F 0 "#PWR015" H 1050 6000 50  0001 C CNN
@@ -1237,7 +1237,7 @@ SMB1
 Text GLabel 5500 2550 0    50   Output ~ 0
 LMB
 $Comp
-L power:GND #PWR0111
+L mouse-rescue:GND-power #PWR0111
 U 1 1 6033B5A0
 P 6300 3000
 F 0 "#PWR0111" H 6300 2750 50  0001 C CNN
@@ -1250,7 +1250,7 @@ $EndComp
 Wire Wire Line
 	5800 2900 5850 2900
 $Comp
-L Device:C C14
+L mouse-rescue:C-Device C14
 U 1 1 60286212
 P 5500 2700
 F 0 "C14" H 5615 2746 50  0000 L CNN
@@ -1261,7 +1261,7 @@ F 3 "~" H 5500 2700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0104
+L mouse-rescue:+3.3V-power #PWR0104
 U 1 1 60261D84
 P 5800 2250
 F 0 "#PWR0104" H 5800 2100 50  0001 C CNN
@@ -1283,7 +1283,7 @@ F 3 "" H 2400 7400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Regulator_Linear:AP2127N-3.3 U5
+L mouse-rescue:AP2127N-3.3-Regulator_Linear U5
 U 1 1 601E6C96
 P 9750 1100
 F 0 "U5" H 9750 1342 50  0000 C CNN
@@ -1294,7 +1294,7 @@ F 3 "https://www.diodes.com/assets/Datasheets/AP2127.pdf" H 9750 1100 50  0001 C
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW4
+L mouse-rescue:SW_SPDT-mouseComp SW4
 U 1 1 601E71D4
 P 6050 2900
 F 0 "SW4" H 6050 3185 50  0000 C CNN
@@ -1310,7 +1310,7 @@ Wire Wire Line
 	1150 1900 1150 1800
 Connection ~ 1150 1800
 $Comp
-L Device:R R10
+L mouse-rescue:R-Device R10
 U 1 1 602DE7E7
 P 5800 2400
 F 0 "R10" H 5600 2450 50  0000 L CNN
@@ -1330,7 +1330,7 @@ Wire Wire Line
 Wire Wire Line
 	5800 2550 5500 2550
 $Comp
-L power:GND #PWR0105
+L mouse-rescue:GND-power #PWR0105
 U 1 1 6032BAA5
 P 5500 2850
 F 0 "#PWR0105" H 5500 2600 50  0001 C CNN
@@ -1349,7 +1349,7 @@ Wire Notes Line
 Wire Notes Line
 	5150 500  5150 5300
 $Comp
-L power:GND #PWR0106
+L mouse-rescue:GND-power #PWR0106
 U 1 1 60395CFD
 P 7450 3050
 F 0 "#PWR0106" H 7450 2800 50  0001 C CNN
@@ -1362,7 +1362,7 @@ $EndComp
 Wire Wire Line
 	6950 2950 7000 2950
 $Comp
-L Device:C C24
+L mouse-rescue:C-Device C24
 U 1 1 60395D04
 P 6650 2750
 F 0 "C24" H 6765 2796 50  0000 L CNN
@@ -1373,7 +1373,7 @@ F 3 "~" H 6650 2750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0107
+L mouse-rescue:+3.3V-power #PWR0107
 U 1 1 60395D0A
 P 6950 2300
 F 0 "#PWR0107" H 6950 2150 50  0001 C CNN
@@ -1384,7 +1384,7 @@ F 3 "" H 6950 2300 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW6
+L mouse-rescue:SW_SPDT-mouseComp SW6
 U 1 1 60395D10
 P 7200 2950
 F 0 "SW6" H 7200 3235 50  0000 C CNN
@@ -1397,7 +1397,7 @@ $EndComp
 Wire Wire Line
 	7450 3050 7400 3050
 $Comp
-L Device:R R12
+L mouse-rescue:R-Device R12
 U 1 1 60395D17
 P 6950 2450
 F 0 "R12" H 6750 2500 50  0000 L CNN
@@ -1417,7 +1417,7 @@ Wire Wire Line
 Wire Wire Line
 	6950 2600 6650 2600
 $Comp
-L power:GND #PWR0108
+L mouse-rescue:GND-power #PWR0108
 U 1 1 60395D22
 P 6650 2900
 F 0 "#PWR0108" H 6650 2650 50  0001 C CNN
@@ -1428,7 +1428,7 @@ F 3 "" H 6650 2900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0109
+L mouse-rescue:GND-power #PWR0109
 U 1 1 603A6A19
 P 6250 4200
 F 0 "#PWR0109" H 6250 3950 50  0001 C CNN
@@ -1441,7 +1441,7 @@ $EndComp
 Wire Wire Line
 	5750 4100 5800 4100
 $Comp
-L Device:C C16
+L mouse-rescue:C-Device C16
 U 1 1 603A6A20
 P 5450 3900
 F 0 "C16" H 5565 3946 50  0000 L CNN
@@ -1452,7 +1452,7 @@ F 3 "~" H 5450 3900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0110
+L mouse-rescue:+3.3V-power #PWR0110
 U 1 1 603A6A26
 P 5750 3450
 F 0 "#PWR0110" H 5750 3300 50  0001 C CNN
@@ -1463,7 +1463,7 @@ F 3 "" H 5750 3450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW3
+L mouse-rescue:SW_SPDT-mouseComp SW3
 U 1 1 603A6A2C
 P 6000 4100
 F 0 "SW3" H 6000 4385 50  0000 C CNN
@@ -1476,7 +1476,7 @@ $EndComp
 Wire Wire Line
 	6250 4200 6200 4200
 $Comp
-L Device:R R9
+L mouse-rescue:R-Device R9
 U 1 1 603A6A33
 P 5750 3600
 F 0 "R9" H 5550 3650 50  0000 L CNN
@@ -1496,7 +1496,7 @@ Wire Wire Line
 Wire Wire Line
 	5750 3750 5450 3750
 $Comp
-L power:GND #PWR0112
+L mouse-rescue:GND-power #PWR0112
 U 1 1 603A6A3E
 P 5450 4050
 F 0 "#PWR0112" H 5450 3800 50  0001 C CNN
@@ -1507,7 +1507,7 @@ F 3 "" H 5450 4050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0113
+L mouse-rescue:GND-power #PWR0113
 U 1 1 603B273A
 P 7600 4300
 F 0 "#PWR0113" H 7600 4050 50  0001 C CNN
@@ -1520,7 +1520,7 @@ $EndComp
 Wire Wire Line
 	7100 4200 7150 4200
 $Comp
-L Device:C C25
+L mouse-rescue:C-Device C25
 U 1 1 603B2741
 P 6800 4000
 F 0 "C25" H 6915 4046 50  0000 L CNN
@@ -1531,7 +1531,7 @@ F 3 "~" H 6800 4000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0114
+L mouse-rescue:+3.3V-power #PWR0114
 U 1 1 603B2747
 P 7100 3550
 F 0 "#PWR0114" H 7100 3400 50  0001 C CNN
@@ -1542,7 +1542,7 @@ F 3 "" H 7100 3550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW7
+L mouse-rescue:SW_SPDT-mouseComp SW7
 U 1 1 603B274D
 P 7350 4200
 F 0 "SW7" H 7350 4485 50  0000 C CNN
@@ -1555,7 +1555,7 @@ $EndComp
 Wire Wire Line
 	7600 4300 7550 4300
 $Comp
-L Device:R R13
+L mouse-rescue:R-Device R13
 U 1 1 603B2754
 P 7100 3700
 F 0 "R13" H 6900 3750 50  0000 L CNN
@@ -1575,7 +1575,7 @@ Wire Wire Line
 Wire Wire Line
 	7100 3850 6800 3850
 $Comp
-L power:GND #PWR0115
+L mouse-rescue:GND-power #PWR0115
 U 1 1 603B275F
 P 6800 4150
 F 0 "#PWR0115" H 6800 3900 50  0001 C CNN
@@ -1586,7 +1586,7 @@ F 3 "" H 6800 4150 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0116
+L mouse-rescue:GND-power #PWR0116
 U 1 1 603B969B
 P 6400 5500
 F 0 "#PWR0116" H 6400 5250 50  0001 C CNN
@@ -1599,7 +1599,7 @@ $EndComp
 Wire Wire Line
 	5900 5400 5950 5400
 $Comp
-L power:+3.3V #PWR0117
+L mouse-rescue:+3.3V-power #PWR0117
 U 1 1 603B96A8
 P 5900 4750
 F 0 "#PWR0117" H 5900 4600 50  0001 C CNN
@@ -1610,7 +1610,7 @@ F 3 "" H 5900 4750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW5
+L mouse-rescue:SW_SPDT-mouseComp SW5
 U 1 1 603B96AE
 P 6150 5400
 F 0 "SW5" H 6150 5685 50  0000 C CNN
@@ -1623,7 +1623,7 @@ $EndComp
 Wire Wire Line
 	6400 5500 6350 5500
 $Comp
-L Device:R R11
+L mouse-rescue:R-Device R11
 U 1 1 603B96B5
 P 5900 4900
 F 0 "R11" H 5700 4950 50  0000 L CNN
@@ -1643,7 +1643,7 @@ Wire Wire Line
 Wire Wire Line
 	5900 5050 5600 5050
 $Comp
-L power:GND #PWR0118
+L mouse-rescue:GND-power #PWR0118
 U 1 1 603B96C0
 P 5600 5350
 F 0 "#PWR0118" H 5600 5100 50  0001 C CNN
@@ -1654,7 +1654,7 @@ F 3 "" H 5600 5350 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0119
+L mouse-rescue:GND-power #PWR0119
 U 1 1 603C7883
 P 7650 5700
 F 0 "#PWR0119" H 7650 5450 50  0001 C CNN
@@ -1667,7 +1667,7 @@ $EndComp
 Wire Wire Line
 	7150 5600 7200 5600
 $Comp
-L Device:C C26
+L mouse-rescue:C-Device C26
 U 1 1 603C788A
 P 6850 5400
 F 0 "C26" H 6965 5446 50  0000 L CNN
@@ -1678,7 +1678,7 @@ F 3 "~" H 6850 5400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0120
+L mouse-rescue:+3.3V-power #PWR0120
 U 1 1 603C7890
 P 7150 4950
 F 0 "#PWR0120" H 7150 4800 50  0001 C CNN
@@ -1689,7 +1689,7 @@ F 3 "" H 7150 4950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW8
+L mouse-rescue:SW_SPDT-mouseComp SW8
 U 1 1 603C7896
 P 7400 5600
 F 0 "SW8" H 7400 5885 50  0000 C CNN
@@ -1702,7 +1702,7 @@ $EndComp
 Wire Wire Line
 	7650 5700 7600 5700
 $Comp
-L Device:R R14
+L mouse-rescue:R-Device R14
 U 1 1 603C789D
 P 7150 5100
 F 0 "R14" H 6950 5150 50  0000 L CNN
@@ -1722,7 +1722,7 @@ Wire Wire Line
 Wire Wire Line
 	7150 5250 6850 5250
 $Comp
-L power:GND #PWR0121
+L mouse-rescue:GND-power #PWR0121
 U 1 1 603C78A8
 P 6850 5550
 F 0 "#PWR0121" H 6850 5300 50  0001 C CNN
@@ -1733,7 +1733,7 @@ F 3 "" H 6850 5550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR0122
+L mouse-rescue:GND-power #PWR0122
 U 1 1 603CFD3D
 P 6200 7000
 F 0 "#PWR0122" H 6200 6750 50  0001 C CNN
@@ -1746,7 +1746,7 @@ $EndComp
 Wire Wire Line
 	5700 6900 5750 6900
 $Comp
-L Device:C C15
+L mouse-rescue:C-Device C15
 U 1 1 603CFD44
 P 5400 6700
 F 0 "C15" H 5515 6746 50  0000 L CNN
@@ -1757,7 +1757,7 @@ F 3 "~" H 5400 6700 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3.3V #PWR0123
+L mouse-rescue:+3.3V-power #PWR0123
 U 1 1 603CFD4A
 P 5700 6250
 F 0 "#PWR0123" H 5700 6100 50  0001 C CNN
@@ -1768,7 +1768,7 @@ F 3 "" H 5700 6250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L mouseComp:SW_SPDT SW2
+L mouse-rescue:SW_SPDT-mouseComp SW2
 U 1 1 603CFD50
 P 5950 6900
 F 0 "SW2" H 5950 7185 50  0000 C CNN
@@ -1781,7 +1781,7 @@ $EndComp
 Wire Wire Line
 	6200 7000 6150 7000
 $Comp
-L Device:R R8
+L mouse-rescue:R-Device R8
 U 1 1 603CFD57
 P 5700 6400
 F 0 "R8" H 5500 6450 50  0000 L CNN
@@ -1801,7 +1801,7 @@ Wire Wire Line
 Wire Wire Line
 	5700 6550 5400 6550
 $Comp
-L power:GND #PWR0124
+L mouse-rescue:GND-power #PWR0124
 U 1 1 603CFD62
 P 5400 6850
 F 0 "#PWR0124" H 5400 6600 50  0001 C CNN
@@ -1812,7 +1812,7 @@ F 3 "" H 5400 6850 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C22
+L mouse-rescue:C-Device C22
 U 1 1 603B96A2
 P 5600 5200
 F 0 "C22" H 5715 5246 50  0000 L CNN
@@ -1829,12 +1829,12 @@ Wire Notes Line
 Wire Notes Line
 	7900 3550 7900 6500
 $Comp
-L Device:Rotary_Encoder SW?
+L mouse-rescue:Rotary_Encoder-Device SW9
 U 1 1 602B655E
 P 9700 4850
-F 0 "SW?" H 9930 4896 50  0000 L CNN
+F 0 "SW9" H 9930 4896 50  0000 L CNN
 F 1 "Rotary_Encoder" H 9930 4805 50  0000 L CNN
-F 2 "" H 9550 5010 50  0001 C CNN
+F 2 "Encoder:EC10E" H 9550 5010 50  0001 C CNN
 F 3 "~" H 9700 5110 50  0001 C CNN
 	1    9700 4850
 	1    0    0    -1  
@@ -1842,10 +1842,10 @@ $EndComp
 Text Notes 8000 3700 0    50   ~ 0
 Scrool Wheel\n
 $Comp
-L power:GND #PWR?
+L mouse-rescue:GND-power #PWR0125
 U 1 1 602C1889
 P 9100 4900
-F 0 "#PWR?" H 9100 4650 50  0001 C CNN
+F 0 "#PWR0125" H 9100 4650 50  0001 C CNN
 F 1 "GND" H 9105 4727 50  0000 C CNN
 F 2 "" H 9100 4900 50  0001 C CNN
 F 3 "" H 9100 4900 50  0001 C CNN
@@ -1857,10 +1857,10 @@ Wire Wire Line
 Wire Wire Line
 	9100 4850 9100 4900
 $Comp
-L Device:C C?
+L mouse-rescue:C-Device C27
 U 1 1 602ECED8
 P 8700 4900
-F 0 "C?" H 8815 4946 50  0000 L CNN
+F 0 "C27" H 8815 4946 50  0000 L CNN
 F 1 "100n" H 8815 4855 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 8738 4750 50  0001 C CNN
 F 3 "~" H 8700 4900 50  0001 C CNN
@@ -1868,10 +1868,10 @@ F 3 "~" H 8700 4900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C?
+L mouse-rescue:C-Device C28
 U 1 1 602F4AA0
 P 9300 5450
-F 0 "C?" H 9415 5496 50  0000 L CNN
+F 0 "C28" H 9415 5496 50  0000 L CNN
 F 1 "100n" H 9415 5405 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9338 5300 50  0001 C CNN
 F 3 "~" H 9300 5450 50  0001 C CNN
@@ -1881,10 +1881,10 @@ $EndComp
 Wire Wire Line
 	9400 4950 9300 4950
 $Comp
-L power:GND #PWR?
+L mouse-rescue:GND-power #PWR0126
 U 1 1 6033F279
 P 8700 5050
-F 0 "#PWR?" H 8700 4800 50  0001 C CNN
+F 0 "#PWR0126" H 8700 4800 50  0001 C CNN
 F 1 "GND" H 8705 4877 50  0000 C CNN
 F 2 "" H 8700 5050 50  0001 C CNN
 F 3 "" H 8700 5050 50  0001 C CNN
@@ -1892,10 +1892,10 @@ F 3 "" H 8700 5050 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L mouse-rescue:GND-power #PWR0127
 U 1 1 603472FD
 P 9300 5600
-F 0 "#PWR?" H 9300 5350 50  0001 C CNN
+F 0 "#PWR0127" H 9300 5350 50  0001 C CNN
 F 1 "GND" H 9305 5427 50  0000 C CNN
 F 2 "" H 9300 5600 50  0001 C CNN
 F 3 "" H 9300 5600 50  0001 C CNN
@@ -1903,10 +1903,10 @@ F 3 "" H 9300 5600 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R R?
+L mouse-rescue:R-Device R15
 U 1 1 60358AA6
 P 9050 4750
-F 0 "R?" V 9150 4800 50  0000 L CNN
+F 0 "R15" V 9150 4800 50  0000 L CNN
 F 1 "10K" V 9150 4650 50  0000 L CNN
 F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 8980 4750 50  0001 C CNN
 F 3 "~" H 9050 4750 50  0001 C CNN
@@ -1914,10 +1914,10 @@ F 3 "~" H 9050 4750 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:R R?
+L mouse-rescue:R-Device R16
 U 1 1 60369A85
 P 9300 5100
-F 0 "R?" H 9100 5150 50  0000 L CNN
+F 0 "R16" H 9100 5150 50  0000 L CNN
 F 1 "10K" H 9100 5050 50  0000 L CNN
 F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 9230 5100 50  0001 C CNN
 F 3 "~" H 9300 5100 50  0001 C CNN