diff --git a/Datasheets/OS102011MS2QN1_C&K.pdf b/Datasheets/OS102011MS2QN1_C&K.pdf
new file mode 100644
index 0000000..b19a9bf
Binary files /dev/null and b/Datasheets/OS102011MS2QN1_C&K.pdf differ
diff --git a/Generic.bck b/Generic.bck
new file mode 100644
index 0000000..5f3ed79
--- /dev/null
+++ b/Generic.bck
@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library
diff --git a/Generic.dcm b/Generic.dcm
new file mode 100644
index 0000000..5f3ed79
--- /dev/null
+++ b/Generic.dcm
@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0
+#
+#End Doc Library
diff --git a/Generic.lib b/Generic.lib
new file mode 100644
index 0000000..ebab452
--- /dev/null
+++ b/Generic.lib
@@ -0,0 +1,72 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# 2-BitFemaleHeader
+#
+DEF 2-BitFemaleHeader U 0 40 Y Y 1 F N
+F0 "U" 0 300 50 H V C CNN
+F1 "2-BitFemaleHeader" 0 200 50 H V C CNN
+F2 "*Generic:2-PinFemaleHeader" 0 400 50 H I C CNN
+F3 "" 0 300 50 H I C CNN
+DRAW
+S -50 100 50 -100 0 1 0 f
+X ~ 1 -150 50 100 R 50 50 1 1 P
+X ~ 2 -150 -50 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# 2-BitMaleHeader
+#
+DEF 2-BitMaleHeader U 0 40 Y Y 1 F N
+F0 "U" 0 300 50 H V C CNN
+F1 "2-BitMaleHeader" 0 200 50 H V C CNN
+F2 "*Generic:2-PinMaleHeader" 0 400 50 H I C CNN
+F3 "" 0 300 50 H I C CNN
+DRAW
+S -50 100 50 -100 0 1 0 f
+X ~ 1 -150 50 100 R 50 50 1 1 P
+X ~ 2 -150 -50 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# 8-BitFemaleHeader
+#
+DEF 8-BitFemaleHeader U 0 40 Y Y 1 F N
+F0 "U" 0 600 50 H V C CNN
+F1 "8-BitFemaleHeader" 0 500 50 H V C CNN
+F2 "*Generic:8-PinFemaleHeader" 0 700 50 H I C CNN
+F3 "" 0 600 50 H I C CNN
+DRAW
+S -50 400 50 -400 0 1 0 f
+X ~ 1 -150 350 100 R 50 50 1 1 P
+X ~ 2 -150 250 100 R 50 50 1 1 P
+X ~ 3 -150 150 100 R 50 50 1 1 P
+X ~ 4 -150 50 100 R 50 50 1 1 P
+X ~ 5 -150 -50 100 R 50 50 1 1 P
+X ~ 6 -150 -150 100 R 50 50 1 1 P
+X ~ 7 -150 -250 100 R 50 50 1 1 P
+X ~ 8 -150 -350 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# 8-BitMaleHeader
+#
+DEF 8-BitMaleHeader U 0 40 Y Y 1 F N
+F0 "U" 0 600 50 H V C CNN
+F1 "8-BitMaleHeader" 0 500 50 H V C CNN
+F2 "*Generic:8-PinMaleHeader" 0 700 50 H I C CNN
+F3 "" 0 600 50 H I C CNN
+DRAW
+S -50 400 50 -400 0 1 0 f
+X ~ 1 -150 350 100 R 50 50 1 1 P
+X ~ 2 -150 250 100 R 50 50 1 1 P
+X ~ 3 -150 150 100 R 50 50 1 1 P
+X ~ 4 -150 50 100 R 50 50 1 1 P
+X ~ 5 -150 -50 100 R 50 50 1 1 P
+X ~ 6 -150 -150 100 R 50 50 1 1 P
+X ~ 7 -150 -250 100 R 50 50 1 1 P
+X ~ 8 -150 -350 100 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Generic.pretty/2-PinFemaleHeader.kicad_mod b/Generic.pretty/2-PinFemaleHeader.kicad_mod
new file mode 100644
index 0000000..791018b
--- /dev/null
+++ b/Generic.pretty/2-PinFemaleHeader.kicad_mod
@@ -0,0 +1,14 @@
+(module 2-PinFemaleHeader (layer F.Cu) (tedit 5E2E3E6E)
+  (fp_text reference REF** (at 0 -3.81) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value 2-PinFemaleHeader (at 0 -6.35) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.27 -2.54) (end -1.27 2.54) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 2.54) (end 1.27 2.54) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 2.54) (end 1.27 -2.54) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 -2.54) (end -1.27 -2.54) (layer F.SilkS) (width 0.12))
+  (pad 1 thru_hole roundrect (at 0 -1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) (roundrect_rratio 0.25))
+  (pad 2 thru_hole circle (at 0 1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+)
diff --git a/Generic.pretty/2-PinMaleHeader.kicad_mod b/Generic.pretty/2-PinMaleHeader.kicad_mod
new file mode 100644
index 0000000..1c6eb53
--- /dev/null
+++ b/Generic.pretty/2-PinMaleHeader.kicad_mod
@@ -0,0 +1,14 @@
+(module 2-PinMaleHeader (layer F.Cu) (tedit 5E2E3E6E)
+  (fp_text reference REF** (at 0 -3.81) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value 2-PinMaleHeader (at 0 -6.35) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.27 -2.54) (end -1.27 2.54) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 2.54) (end 1.27 2.54) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 2.54) (end 1.27 -2.54) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 -2.54) (end -1.27 -2.54) (layer F.SilkS) (width 0.12))
+  (pad 1 thru_hole roundrect (at 0 -1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) (roundrect_rratio 0.25))
+  (pad 2 thru_hole circle (at 0 1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+)
diff --git a/Generic.pretty/8-PinFemaleHeader.kicad_mod b/Generic.pretty/8-PinFemaleHeader.kicad_mod
new file mode 100644
index 0000000..5f20a66
--- /dev/null
+++ b/Generic.pretty/8-PinFemaleHeader.kicad_mod
@@ -0,0 +1,20 @@
+(module 8-PinFemaleHeader (layer F.Cu) (tedit 5E2E3A9B)
+  (fp_text reference REF** (at 0 -11.43) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value 8-PinFemaleHeader (at 0 -13.97) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 1.27 -10.16) (end -1.27 -10.16) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 10.16) (end 1.27 -10.16) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 10.16) (end 1.27 10.16) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 -10.16) (end -1.27 10.16) (layer F.SilkS) (width 0.12))
+  (pad 7 thru_hole circle (at 0 6.35) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 4 thru_hole circle (at 0 -1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 8 thru_hole circle (at 0 8.89) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 6 thru_hole circle (at 0 3.81) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 3 thru_hole circle (at 0 -3.81) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 5 thru_hole circle (at 0 1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 2 thru_hole circle (at 0 -6.35) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 1 thru_hole roundrect (at 0 -8.89) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) (roundrect_rratio 0.25))
+)
diff --git a/Generic.pretty/8-PinMaleHeader.kicad_mod b/Generic.pretty/8-PinMaleHeader.kicad_mod
new file mode 100644
index 0000000..a879c61
--- /dev/null
+++ b/Generic.pretty/8-PinMaleHeader.kicad_mod
@@ -0,0 +1,20 @@
+(module 8-PinMaleHeader (layer F.Cu) (tedit 5E2E3AB1)
+  (fp_text reference REF** (at 0 -11.43) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value 8-PinMaleHeader (at 0 -13.97) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.27 -10.16) (end -1.27 10.16) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.27 10.16) (end 1.27 10.16) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 10.16) (end 1.27 -10.16) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.27 -10.16) (end -1.27 -10.16) (layer F.SilkS) (width 0.12))
+  (pad 1 thru_hole roundrect (at 0 -8.89) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) (roundrect_rratio 0.25))
+  (pad 2 thru_hole circle (at 0 -6.35) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 3 thru_hole circle (at 0 -3.81) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 4 thru_hole circle (at 0 -1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 5 thru_hole circle (at 0 1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 6 thru_hole circle (at 0 3.81) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 7 thru_hole circle (at 0 6.35) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 8 thru_hole circle (at 0 8.89) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+)
diff --git a/Master.bck b/Master.bck
index 2edf7f6..8129ad2 100644
--- a/Master.bck
+++ b/Master.bck
@@ -35,6 +35,11 @@ D General Purpose Relay DPDT (2 Form C) Through Hole
 F https://omronfs.omron.com/en_US/ecb/products/pdf/en-g5v_2.pdf
 $ENDCMP
 #
+$CMP OS102011MS2QN1_C&K
+D Slide Switch SPDT Through Hole
+F https://dznh3ojzb2azq.cloudfront.net/products/Slide/OS/documents/datasheet.pdf
+$ENDCMP
+#
 $CMP SN74HCT540N_TexasInstruments
 D Buffer, Inverting 1 Element 8 Bit per Element 3-State Output 20-PDIP
 F http://www.ti.com/general/docs/suppproductinfo.tsp?distId=10&gotoUrl=http%3A%2F%2Fwww.ti.com%2Flit%2Fgpn%2Fsn74hct540
diff --git a/Master.dcm b/Master.dcm
index 2edf7f6..8129ad2 100644
--- a/Master.dcm
+++ b/Master.dcm
@@ -35,6 +35,11 @@ D General Purpose Relay DPDT (2 Form C) Through Hole
 F https://omronfs.omron.com/en_US/ecb/products/pdf/en-g5v_2.pdf
 $ENDCMP
 #
+$CMP OS102011MS2QN1_C&K
+D Slide Switch SPDT Through Hole
+F https://dznh3ojzb2azq.cloudfront.net/products/Slide/OS/documents/datasheet.pdf
+$ENDCMP
+#
 $CMP SN74HCT540N_TexasInstruments
 D Buffer, Inverting 1 Element 8 Bit per Element 3-State Output 20-PDIP
 F http://www.ti.com/general/docs/suppproductinfo.tsp?distId=10&gotoUrl=http%3A%2F%2Fwww.ti.com%2Flit%2Fgpn%2Fsn74hct540
diff --git a/Master.lib b/Master.lib
index d47ce91..d177f98 100644
--- a/Master.lib
+++ b/Master.lib
@@ -543,6 +543,30 @@ X NO 9 700 -350 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# OS102011MS2QN1_C&K
+#
+DEF OS102011MS2QN1_C&K U 0 40 Y Y 1 F N
+F0 "U" 0 400 50 H V C CNN
+F1 "OS102011MS2QN1_C&K" 0 300 50 H V C CNN
+F2 "!Master:OS102011MS2QN1_C&K" 0 500 50 H I C CNN
+F3 "" 0 400 50 H I C CNN
+DRAW
+C -100 80 20 1 1 0 N
+C 0 -80 20 1 1 0 N
+C 100 80 20 1 1 0 N
+S -250 200 250 -150 0 1 0 f
+P 2 0 1 0 -200 -100 -200 -150 N
+P 2 0 1 0 0 -100 0 -150 N
+P 2 0 1 0 200 -100 200 -150 N
+P 4 0 1 0 -100 100 -100 150 -200 150 -200 -100 N
+P 4 0 1 0 100 100 100 150 200 150 200 -100 N
+P 2 1 1 0 -10 -60 -90 65 N
+X ~ 1 -200 -250 100 U 50 50 1 1 P
+X ~ 2 0 -250 100 U 50 50 1 1 P
+X ~ 3 200 -250 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # SN74HCT540N_TexasInstruments
 #
 DEF SN74HCT540N_TexasInstruments U 0 40 Y Y 1 F N
diff --git a/Master.pretty/208-8_CTSElectrocomponents.kicad_mod b/Master.pretty/208-8_CTSElectrocomponents.kicad_mod
index 95ce7ab..ee531da 100644
--- a/Master.pretty/208-8_CTSElectrocomponents.kicad_mod
+++ b/Master.pretty/208-8_CTSElectrocomponents.kicad_mod
@@ -1,9 +1,9 @@
-(module 208-8_CTSElectrocomponents (layer F.Cu) (tedit 5E2BCEA4)
+(module 208-8_CTSElectrocomponents (layer F.Cu) (tedit 5E2E4256)
   (descr "Dip Switch SPST 8 Position Through Hole Slide (Standard) Actuator 50mA 24VDC")
   (fp_text reference REF** (at 0 -6.35) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value 208-8 (at 0 0) (layer F.Fab)
+  (fp_text value 208-8_CTSElectrocomponents (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -11.375 -5.015) (end -11.375 5.015) (layer F.SilkS) (width 0.12))
diff --git a/Master.pretty/4116R-1-102LF_Bourns.kicad_mod b/Master.pretty/4116R-1-102LF_Bourns.kicad_mod
index 5ad866c..b2fa01b 100644
--- a/Master.pretty/4116R-1-102LF_Bourns.kicad_mod
+++ b/Master.pretty/4116R-1-102LF_Bourns.kicad_mod
@@ -1,9 +1,9 @@
-(module 4116R-1-102LF_Bourns (layer F.Cu) (tedit 5E2D4B7A)
+(module 4116R-1-102LF_Bourns (layer F.Cu) (tedit 5E2E4249)
   (descr "1k Ohm ±2% 250mW Power Per Element Isolated  Resistor Network/Array ±100ppm/°C 16-DIP (0.300\", 7.62mm)")
   (fp_text reference REF** (at 0 -12.7) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value 4116R-1-102LF (at 0 0 90) (layer F.Fab)
+  (fp_text value 4116R-1-102LF_Bourns (at 0 0 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -3.935 -10.985) (end 3.935 -10.985) (layer F.SilkS) (width 0.12))
diff --git a/Master.pretty/4116R-1-103_Bourns.kicad_mod b/Master.pretty/4116R-1-103_Bourns.kicad_mod
index 3c1fc27..8bbcaa1 100644
--- a/Master.pretty/4116R-1-103_Bourns.kicad_mod
+++ b/Master.pretty/4116R-1-103_Bourns.kicad_mod
@@ -1,9 +1,9 @@
-(module 4116R-1-103_Bourns (layer F.Cu) (tedit 5E2D4CC4)
+(module 4116R-1-103_Bourns (layer F.Cu) (tedit 5E2E4241)
   (descr "10k Ohm ±2% 250mW Power Per Element Isolated  Resistor Network/Array ±100ppm/°C 16-DIP (0.300\", 7.62mm)")
   (fp_text reference REF** (at 0 -12.7) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value 4116R-1-103 (at 0 0 90) (layer F.Fab)
+  (fp_text value 4116R-1-103_Bourns (at 0 0 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -3.935 -10.985) (end 3.935 -10.985) (layer F.SilkS) (width 0.12))
diff --git a/Master.pretty/4116R-1-105LF_Bourns.kicad_mod b/Master.pretty/4116R-1-105LF_Bourns.kicad_mod
index 8ac238c..000f524 100644
--- a/Master.pretty/4116R-1-105LF_Bourns.kicad_mod
+++ b/Master.pretty/4116R-1-105LF_Bourns.kicad_mod
@@ -1,9 +1,9 @@
-(module 4116R-1-105LF_Bourns (layer F.Cu) (tedit 5E2D4C99)
+(module 4116R-1-105LF_Bourns (layer F.Cu) (tedit 5E2E423A)
   (descr "1M Ohm ±2% 250mW Power Per Element Isolated  Resistor Network/Array ±100ppm/°C 16-DIP (0.300\", 7.62mm)")
   (fp_text reference REF** (at 0 -12.7) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value 4116R-1-105LF (at 0 0 90) (layer F.Fab)
+  (fp_text value 4116R-1-105LF_Bourns (at 0 0 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -3.935 -10.985) (end 3.935 -10.985) (layer F.SilkS) (width 0.12))
diff --git a/Master.pretty/4116R-1-331LF_Bourns.kicad_mod b/Master.pretty/4116R-1-331LF_Bourns.kicad_mod
index 96d8e75..f7314e4 100644
--- a/Master.pretty/4116R-1-331LF_Bourns.kicad_mod
+++ b/Master.pretty/4116R-1-331LF_Bourns.kicad_mod
@@ -1,9 +1,9 @@
-(module 4116R-1-331LF_Bourns (layer F.Cu) (tedit 5E2D4B65)
+(module 4116R-1-331LF_Bourns (layer F.Cu) (tedit 5E2E4233)
   (descr "330 Ohm ±2% 250mW Power Per Element Isolated  Resistor Network/Array ±100ppm/°C 16-DIP (0.300\", 7.62mm)")
   (fp_text reference REF** (at 0 -12.7) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value 4116R-1-331LF (at 0 0 90) (layer F.Fab)
+  (fp_text value 4116R-1-331LF_Bourns (at 0 0 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -3.935 -10.985) (end 3.935 -10.985) (layer F.SilkS) (width 0.12))
diff --git a/Master.pretty/DC10EWA_Kingbright.kicad_mod b/Master.pretty/DC10EWA_Kingbright.kicad_mod
index da05181..4e91c4e 100644
--- a/Master.pretty/DC10EWA_Kingbright.kicad_mod
+++ b/Master.pretty/DC10EWA_Kingbright.kicad_mod
@@ -1,16 +1,15 @@
-(module DC10EWA_Kingbright (layer F.Cu) (tedit 5E2BC739)
+(module DC10EWA_Kingbright (layer F.Cu) (tedit 5E2E4F39)
   (descr "LED Circuit Board Indicator Bar - 10 Wide, DIP Red (x 10) Diffused, White 2V 30mA  Through Hole")
   (fp_text reference REF** (at 0 -6.35 180) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value DC10EWA (at 0 0) (layer F.Fab)
+  (fp_text value DC10EWA_Kingbright (at 0 0) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -11.7 5.08) (end 12.7 5.08) (layer F.SilkS) (width 0.12))
   (fp_line (start 12.7 5.08) (end 12.7 -5.08) (layer F.SilkS) (width 0.12))
   (fp_line (start 12.7 -5.08) (end -12.7 -5.08) (layer F.SilkS) (width 0.12))
   (fp_line (start -12.7 4.08) (end -12.7 -5.08) (layer F.SilkS) (width 0.12))
-  (fp_arc (start -12.7 0) (end -12.7 1) (angle -180) (layer F.SilkS) (width 0.12))
   (fp_line (start -12.7 4.08) (end -11.7 5.08) (layer F.SilkS) (width 0.12))
   (pad 1 thru_hole roundrect (at -11.43 3.81) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) (roundrect_rratio 0.25))
   (pad 2 thru_hole circle (at -8.89 3.81) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
diff --git a/Master.pretty/G5V-2-DC3_OmronElectronics.kicad_mod b/Master.pretty/G5V-2-DC3_OmronElectronics.kicad_mod
index 266b192..945ba4c 100644
--- a/Master.pretty/G5V-2-DC3_OmronElectronics.kicad_mod
+++ b/Master.pretty/G5V-2-DC3_OmronElectronics.kicad_mod
@@ -1,9 +1,9 @@
-(module G5V-2-DC3_OmronElectronics (layer F.Cu) (tedit 5E2CF1D2)
+(module G5V-2-DC3_OmronElectronics (layer F.Cu) (tedit 5E2E4218)
   (descr "General Purpose Relay DPDT (2 Form C) Through Hole")
   (fp_text reference REF** (at 0 -11.43) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value G5V-2-DC3 (at 0 0 90) (layer F.Fab)
+  (fp_text value G5V-2-DC3_OmronElectronics (at 0 -13.97 180) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start 5.05 -10.25) (end -5.05 -10.25) (layer F.SilkS) (width 0.12))
diff --git a/Master.pretty/OS102011MS2QN1_C&K.kicad_mod b/Master.pretty/OS102011MS2QN1_C&K.kicad_mod
new file mode 100644
index 0000000..768a970
--- /dev/null
+++ b/Master.pretty/OS102011MS2QN1_C&K.kicad_mod
@@ -0,0 +1,18 @@
+(module OS102011MS2QN1_C&K (layer F.Cu) (tedit 5E2E46C6)
+  (descr "Slide Switch SPDT Through Hole")
+  (fp_text reference REF** (at 0 -3) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value OS102011MS2QN1_C&K (at 0 -5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -4.3 -2.15) (end 4.3 -2.15) (layer F.SilkS) (width 0.12))
+  (fp_line (start 4.3 -2.15) (end 4.3 2.15) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.3 2.15) (end 4.3 2.15) (layer F.SilkS) (width 0.12))
+  (fp_line (start -4.3 2.15) (end -4.3 -2.15) (layer F.SilkS) (width 0.12))
+  (pad 2 thru_hole circle (at 0 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 1 thru_hole roundrect (at -2 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) (roundrect_rratio 0.25))
+  (pad "" thru_hole circle (at 4.1 0) (size 2 2) (drill 1.25) (layers *.Cu *.Mask))
+  (pad "" thru_hole circle (at -4.1 0) (size 2 2) (drill 1.25) (layers *.Cu *.Mask))
+  (pad 3 thru_hole circle (at 2 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+)
diff --git a/Master.pretty/SN74HCT540N_TexasInstruments.kicad_mod b/Master.pretty/SN74HCT540N_TexasInstruments.kicad_mod
index 5283e85..50da07e 100644
--- a/Master.pretty/SN74HCT540N_TexasInstruments.kicad_mod
+++ b/Master.pretty/SN74HCT540N_TexasInstruments.kicad_mod
@@ -1,16 +1,15 @@
-(module SN74HCT540N_TexasInstruments (layer F.Cu) (tedit 5E2BC4C9)
+(module SN74HCT540N_TexasInstruments (layer F.Cu) (tedit 5E2E4F32)
   (descr "Buffer, Inverting 1 Element 8 Bit per Element 3-State Output 20-PDIP")
   (fp_text reference REF** (at 0 -15.24) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value SN74HCT540N (at 0 0 90) (layer F.Fab)
+  (fp_text value SN74HCT540N_TexasInstruments (at 0 0 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -3.3 13.46) (end -3.3 -13.46) (layer F.SilkS) (width 0.12))
   (fp_line (start -3.3 13.46) (end 3.3 13.46) (layer F.SilkS) (width 0.12))
   (fp_line (start 3.3 13.46) (end 3.3 -13.46) (layer F.SilkS) (width 0.12))
   (fp_line (start -3.3 -13.46) (end 3.3 -13.46) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0 -13.46) (end -1 -13.46) (angle -180) (layer F.SilkS) (width 0.12))
   (pad 8 thru_hole circle (at -3.81 6.35) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
   (pad 7 thru_hole circle (at -3.81 3.81) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
   (pad 6 thru_hole circle (at -3.81 1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
diff --git a/Master.pretty/SN74HCT541N_TexasInstruments.kicad_mod b/Master.pretty/SN74HCT541N_TexasInstruments.kicad_mod
index cc8215f..090c8e7 100644
--- a/Master.pretty/SN74HCT541N_TexasInstruments.kicad_mod
+++ b/Master.pretty/SN74HCT541N_TexasInstruments.kicad_mod
@@ -1,16 +1,15 @@
-(module SN74HCT541N_TexasInstruments (layer F.Cu) (tedit 5E2BC4B7)
+(module SN74HCT541N_TexasInstruments (layer F.Cu) (tedit 5E2E4F2E)
   (descr "Buffer, Inverting 1 Element 8 Bit per Element 3-State Output 20-PDIP")
   (fp_text reference REF** (at 0 -15.24) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value SN74HCT541N (at 0 0 90) (layer F.Fab)
+  (fp_text value SN74HCT541N_TexasInstruments (at 0 0 90) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -3.3 13.46) (end -3.3 -13.46) (layer F.SilkS) (width 0.12))
   (fp_line (start -3.3 13.46) (end 3.3 13.46) (layer F.SilkS) (width 0.12))
   (fp_line (start 3.3 13.46) (end 3.3 -13.46) (layer F.SilkS) (width 0.12))
   (fp_line (start -3.3 -13.46) (end 3.3 -13.46) (layer F.SilkS) (width 0.12))
-  (fp_arc (start 0 -13.46) (end -1 -13.46) (angle -180) (layer F.SilkS) (width 0.12))
   (pad 8 thru_hole circle (at -3.81 6.35) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
   (pad 7 thru_hole circle (at -3.81 3.81) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
   (pad 6 thru_hole circle (at -3.81 1.27) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
diff --git a/Master.pretty/SS-13D16-VG_C&K.kicad_mod b/Master.pretty/SS-13D16-VG_C&K.kicad_mod
index 8681aab..c96c02f 100644
--- a/Master.pretty/SS-13D16-VG_C&K.kicad_mod
+++ b/Master.pretty/SS-13D16-VG_C&K.kicad_mod
@@ -1,19 +1,19 @@
-(module SS-13D16-VG_C&K (layer F.Cu) (tedit 5E2D4188)
+(module SS-13D16-VG_C&K (layer F.Cu) (tedit 5E2E44ED)
   (descr "Slide Switch SP3T Through Hole")
   (fp_text reference REF** (at 0 -3) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (fp_text value SS-13D16-VG (at 0 3) (layer F.Fab)
+  (fp_text value SS-13D16-VG_C&K (at 0 -5) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_line (start -6.3 -2.15) (end 6.3 -2.15) (layer F.SilkS) (width 0.12))
   (fp_line (start -6.3 2.15) (end 6.3 2.15) (layer F.SilkS) (width 0.12))
   (fp_line (start -6.3 -2.15) (end -6.3 2.15) (layer F.SilkS) (width 0.12))
   (fp_line (start 6.3 -2.15) (end 6.3 2.15) (layer F.SilkS) (width 0.12))
-  (pad 1 thru_hole circle (at -4 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
+  (pad 1 thru_hole roundrect (at -4 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) (roundrect_rratio 0.25))
   (pad 2 thru_hole circle (at 0 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
   (pad 3 thru_hole circle (at 2 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
   (pad 4 thru_hole circle (at 4 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask))
-  (pad 5 thru_hole circle (at -6.1 0) (size 2 2) (drill 1.25) (layers *.Cu *.Mask))
-  (pad 6 thru_hole circle (at 6.1 0) (size 2 2) (drill 1.25) (layers *.Cu *.Mask))
+  (pad "" thru_hole circle (at -6.1 0) (size 2 2) (drill 1.25) (layers *.Cu *.Mask))
+  (pad "" thru_hole circle (at 6.1 0) (size 2 2) (drill 1.25) (layers *.Cu *.Mask))
 )