diff --git a/00_Libraries/00_intern/01_symbols/1000_Contactors.kicad_sym b/00_Libraries/00_intern/01_symbols/1000_Contactors.kicad_sym
index 371c663..3e50ddc 100644
--- a/00_Libraries/00_intern/01_symbols/1000_Contactors.kicad_sym
+++ b/00_Libraries/00_intern/01_symbols/1000_Contactors.kicad_sym
@@ -1,9 +1,9 @@
 (kicad_symbol_lib (version 20211014) (generator kicad_symbol_editor)
   (symbol "AL9-30-10" (in_bom yes) (on_board no)
-    (property "Reference" "KM" (id 0) (at 22.86 1.27 0)
+    (property "Reference" "KM" (id 0) (at 8.89 1.27 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "AL9-30-10" (id 1) (at 26.67 -1.27 0)
+    (property "Value" "AL9-30-10" (id 1) (at 12.7 -1.27 0)
       (effects (font (size 1.27 1.27)))
     )
     (property "Footprint" "" (id 2) (at -11.43 0 0)
@@ -13,6 +13,10 @@
       (effects (font (size 1.27 1.27)) hide)
     )
     (symbol "AL9-30-10_0_1"
+      (rectangle (start -16.51 -2.54) (end -26.67 2.54)
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
       (arc (start -10.795 3.175) (mid -9.711 2.726) (end -10.16 3.81)
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
@@ -33,6 +37,38 @@
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
       )
+      (polyline
+        (pts
+          (xy -21.59 -2.54)
+          (xy -21.59 -3.81)
+        )
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy -21.59 3.81)
+          (xy -21.59 2.54)
+        )
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy -16.51 0)
+          (xy -15.24 0)
+        )
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy -13.97 0)
+          (xy -12.7 0)
+        )
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
       (polyline
         (pts
           (xy -11.43 0)
@@ -153,53 +189,17 @@
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
       )
-      (polyline
-        (pts
-          (xy 6.35 0)
-          (xy 7.62 0)
-        )
-        (stroke (width 0) (type default) (color 0 0 0 0))
-        (fill (type none))
-      )
-      (polyline
-        (pts
-          (xy 8.89 0)
-          (xy 10.16 0)
-        )
-        (stroke (width 0) (type default) (color 0 0 0 0))
-        (fill (type none))
-      )
-      (polyline
-        (pts
-          (xy 15.24 -2.54)
-          (xy 15.24 -3.81)
-        )
-        (stroke (width 0) (type default) (color 0 0 0 0))
-        (fill (type none))
-      )
-      (polyline
-        (pts
-          (xy 15.24 3.81)
-          (xy 15.24 2.54)
-        )
-        (stroke (width 0) (type default) (color 0 0 0 0))
-        (fill (type none))
-      )
       (arc (start 0 2.54) (mid 0.449 3.624) (end -0.635 3.175)
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
       )
-      (rectangle (start 20.32 -2.54) (end 10.16 2.54)
-        (stroke (width 0) (type default) (color 0 0 0 0))
-        (fill (type none))
-      )
     )
     (symbol "AL9-30-10_1_1"
-      (pin input line (at 15.24 -6.35 90) (length 2.54)
+      (pin input line (at -21.59 -6.35 90) (length 2.54)
         (name "" (effects (font (size 1.27 1.27))))
         (number "-A2" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at 15.24 6.35 270) (length 2.54)
+      (pin input line (at -21.59 6.35 270) (length 2.54)
         (name "" (effects (font (size 1.27 1.27))))
         (number "A1+" (effects (font (size 1.27 1.27))))
       )
@@ -607,24 +607,20 @@
     )
   )
   (symbol "NL22E" (in_bom yes) (on_board no)
-    (property "Reference" "KM" (id 0) (at 22.86 1.27 0)
+    (property "Reference" "KM" (id 0) (at 12.7 1.27 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "NL22E" (id 1) (at 24.13 -1.27 0)
+    (property "Value" "NL22E" (id 1) (at 13.97 -1.27 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (id 2) (at -11.43 0 0)
+    (property "Footprint" "" (id 2) (at -6.35 0 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at -11.43 0 0)
+    (property "Datasheet" "" (id 3) (at -6.35 0 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (symbol "NL22E_0_1"
-      (arc (start -10.795 3.175) (mid -9.711 2.726) (end -10.16 3.81)
-        (stroke (width 0) (type default) (color 0 0 0 0))
-        (fill (type none))
-      )
-      (arc (start -10.16 2.54) (mid -9.711 3.624) (end -10.795 3.175)
+      (rectangle (start -11.43 -2.54) (end -21.59 2.54)
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
       )
@@ -642,24 +638,24 @@
       )
       (polyline
         (pts
-          (xy -11.43 0)
-          (xy -10.16 0)
+          (xy -16.51 -2.54)
+          (xy -16.51 -3.81)
         )
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
       )
       (polyline
         (pts
-          (xy -10.16 -3.81)
-          (xy -12.7 2.54)
+          (xy -16.51 3.81)
+          (xy -16.51 2.54)
         )
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
       )
       (polyline
         (pts
-          (xy -10.16 3.81)
-          (xy -10.16 2.54)
+          (xy -11.43 0)
+          (xy -10.16 0)
         )
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
@@ -683,14 +679,6 @@
       (polyline
         (pts
           (xy -5.08 -3.81)
-          (xy -7.62 3.175)
-        )
-        (stroke (width 0) (type default) (color 0 0 0 0))
-        (fill (type none))
-      )
-      (polyline
-        (pts
-          (xy -5.08 2.54)
           (xy -7.62 2.54)
         )
         (stroke (width 0) (type default) (color 0 0 0 0))
@@ -763,47 +751,47 @@
       (polyline
         (pts
           (xy 5.08 -3.81)
-          (xy 2.54 2.54)
+          (xy 2.54 3.175)
         )
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
       )
       (polyline
         (pts
-          (xy 5.08 3.81)
           (xy 5.08 2.54)
+          (xy 2.54 2.54)
         )
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
       )
       (polyline
         (pts
-          (xy 6.35 0)
-          (xy 7.62 0)
+          (xy 5.08 3.81)
+          (xy 5.08 2.54)
         )
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
       )
       (polyline
         (pts
-          (xy 8.89 0)
-          (xy 10.16 0)
+          (xy 6.35 0)
+          (xy 7.62 0)
         )
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
       )
       (polyline
         (pts
-          (xy 15.24 -2.54)
-          (xy 15.24 -3.81)
+          (xy 10.16 -3.81)
+          (xy 7.62 2.54)
         )
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
       )
       (polyline
         (pts
-          (xy 15.24 3.81)
-          (xy 15.24 2.54)
+          (xy 10.16 3.81)
+          (xy 10.16 2.54)
         )
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
@@ -820,49 +808,53 @@
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
       )
-      (rectangle (start 20.32 -2.54) (end 10.16 2.54)
+      (arc (start 9.525 3.175) (mid 10.609 2.726) (end 10.16 3.81)
+        (stroke (width 0) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (arc (start 10.16 2.54) (mid 10.609 3.624) (end 9.525 3.175)
         (stroke (width 0) (type default) (color 0 0 0 0))
         (fill (type none))
       )
     )
     (symbol "NL22E_1_1"
-      (pin input line (at 15.24 -6.35 90) (length 2.54)
+      (pin input line (at -16.51 -6.35 90) (length 2.54)
         (name "" (effects (font (size 1.27 1.27))))
         (number "-A2" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at 15.24 6.35 270) (length 2.54)
+      (pin input line (at -16.51 6.35 270) (length 2.54)
         (name "" (effects (font (size 1.27 1.27))))
         (number "A1+" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at -5.08 -6.35 90) (length 2.54)
+      (pin input line (at 0 -6.35 90) (length 2.54)
         (name "" (effects (font (size 1.27 1.27))))
         (number "NC" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at -5.08 6.35 270) (length 2.54)
+      (pin input line (at 0 6.35 270) (length 2.54)
         (name "" (effects (font (size 1.27 1.27))))
         (number "NC" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at 0 -6.35 90) (length 2.54)
+      (pin input line (at 5.08 -6.35 90) (length 2.54)
         (name "" (effects (font (size 1.27 1.27))))
         (number "NC" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at 0 6.35 270) (length 2.54)
+      (pin input line (at 5.08 6.35 270) (length 2.54)
         (name "" (effects (font (size 1.27 1.27))))
         (number "NC" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at -10.16 -6.35 90) (length 2.54)
+      (pin input line (at -5.08 -6.35 90) (length 2.54)
         (name "" (effects (font (size 1.27 1.27))))
         (number "NO" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at -10.16 6.35 270) (length 2.54)
+      (pin input line (at -5.08 6.35 270) (length 2.54)
         (name "" (effects (font (size 1.27 1.27))))
         (number "NO" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at 5.08 -6.35 90) (length 2.54)
+      (pin input line (at 10.16 -6.35 90) (length 2.54)
         (name "" (effects (font (size 1.27 1.27))))
         (number "NO" (effects (font (size 1.27 1.27))))
       )
-      (pin input line (at 5.08 6.35 270) (length 2.54)
+      (pin input line (at 10.16 6.35 270) (length 2.54)
         (name "" (effects (font (size 1.27 1.27))))
         (number "NO" (effects (font (size 1.27 1.27))))
       )
diff --git a/00_Libraries/organisation.txt b/00_Libraries/organisation.txt
index 12bdfa4..86b0039 100644
--- a/00_Libraries/organisation.txt
+++ b/00_Libraries/organisation.txt
@@ -199,3 +199,4 @@
 	2 = Resistors
 	3 = Capacitors
 	4 = Inductors
+	5 = Switches