From a94b6d4e0762f42a8da088b4bac3028344e17c3f Mon Sep 17 00:00:00 2001
From: Unknown <teblunde@gmail.com>
Date: Sun, 3 Mar 2019 23:53:35 +0100
Subject: [PATCH] Accidentally put 74LS373 instead of 74LS374

---
 RC6502 Joystick/RC6502 Joystick-cache.lib     |  12 +-
 RC6502 Joystick/RC6502 Joystick.kicad_pcb     | 172 +++---
 RC6502 Joystick/RC6502 Joystick.net           | 514 +++++++++---------
 RC6502 Joystick/RC6502 Joystick.pro           |   6 +-
 RC6502 Joystick/RC6502 Joystick.sch           |  22 +-
 .../export/RC6502 Joystick-B.Cu.gbl           |  46 +-
 .../export/RC6502 Joystick-B.Mask.gbs         |  46 +-
 .../export/RC6502 Joystick-B.Paste.gbp        |   2 +-
 .../export/RC6502 Joystick-B.SilkS.gbo        |   2 +-
 .../export/RC6502 Joystick-Dwgs.User.gbr      |   2 +-
 .../export/RC6502 Joystick-Edge.Cuts.gm1      |   2 +-
 .../export/RC6502 Joystick-F.Cu.gtl           |  46 +-
 .../export/RC6502 Joystick-F.Mask.gts         |  46 +-
 .../export/RC6502 Joystick-F.Paste.gtp        |   2 +-
 .../export/RC6502 Joystick-F.SilkS.gto        | 401 +++++++-------
 RC6502 Joystick/export/RC6502 Joystick.drl    |   2 +-
 16 files changed, 664 insertions(+), 659 deletions(-)

diff --git a/RC6502 Joystick/RC6502 Joystick-cache.lib b/RC6502 Joystick/RC6502 Joystick-cache.lib
index 1d0c0c7..7509908 100644
--- a/RC6502 Joystick/RC6502 Joystick-cache.lib	
+++ b/RC6502 Joystick/RC6502 Joystick-cache.lib	
@@ -64,11 +64,11 @@ X CE 19 -700 -500 300 R 50 50 1 1 I I
 ENDDRAW
 ENDDEF
 #
-# 74LS373
+# 74LS374
 #
-DEF 74LS373 U 0 40 Y Y 1 F N
+DEF 74LS374 U 0 40 Y Y 1 F N
 F0 "U" 0 0 50 H V C CNN
-F1 "74LS373" 50 -350 50 H V C CNN
+F1 "74LS374" 50 -350 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 DRAW
@@ -84,7 +84,7 @@ X O2 6 700 300 300 L 50 50 1 1 T
 X D2 7 -700 300 300 R 50 50 1 1 I
 X D3 8 -700 200 300 R 50 50 1 1 I
 X O3 9 700 200 300 L 50 50 1 1 T
-X LE 11 -700 -400 300 R 50 50 1 1 I
+X Cp 11 -700 -400 300 R 50 50 1 1 I C
 X O4 12 700 100 300 L 50 50 1 1 T
 X D4 13 -700 100 300 R 50 50 1 1 I
 X D5 14 -700 0 300 R 50 50 1 1 I
@@ -141,8 +141,8 @@ X 3 3 -300 0 150 R 50 50 1 1 P
 X 4 4 -300 200 150 R 50 50 1 1 P
 X 5 5 -300 400 150 R 50 50 1 1 P
 X 6 6 -300 -300 150 R 50 50 1 1 P
-X 7 7 -300 -100 150 R 50 50 1 1 w
-X 8 8 -300 100 150 R 50 50 1 1 w
+X 7 7 -300 -100 150 R 50 50 1 1 W
+X 8 8 -300 100 150 R 50 50 1 1 W
 X 9 9 -300 300 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
diff --git a/RC6502 Joystick/RC6502 Joystick.kicad_pcb b/RC6502 Joystick/RC6502 Joystick.kicad_pcb
index 7c2bc60..a0e83a4 100644
--- a/RC6502 Joystick/RC6502 Joystick.kicad_pcb	
+++ b/RC6502 Joystick/RC6502 Joystick.kicad_pcb	
@@ -3,7 +3,7 @@
   (general
     (links 158)
     (no_connects 0)
-    (area 76.124999 81.204999 175.335001 142.950001)
+    (area 74.225 79.375 177.335 153.309048)
     (thickness 1.6)
     (drawings 55)
     (tracks 779)
@@ -2553,90 +2553,6 @@
     )
   )
 
-  (module Housings_DIP:DIP-20_W7.62mm_Socket (layer F.Cu) (tedit 5C61C5F8) (tstamp 5C616A8B)
-    (at 78.74 112.395)
-    (descr "20-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils), Socket")
-    (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil Socket")
-    (path /5C237A24)
-    (fp_text reference U2 (at 3.81 2.54) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 74LS373 (at 3.81 11.43 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 -1.27) (end 6.985 24.13) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 24.13) (end 0.635 24.13) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.635 24.13) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 -1.33) (end -1.27 24.19) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 24.19) (end 8.89 24.19) (layer F.Fab) (width 0.1))
-    (fp_line (start 8.89 24.19) (end 8.89 -1.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 8.89 -1.33) (end -1.27 -1.33) (layer F.Fab) (width 0.1))
-    (fp_line (start 2.81 -1.33) (end 1.16 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.16 -1.33) (end 1.16 24.19) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.16 24.19) (end 6.46 24.19) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.46 24.19) (end 6.46 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.46 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 -1.39) (end -1.33 24.25) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 24.25) (end 8.95 24.25) (layer F.SilkS) (width 0.12))
-    (fp_line (start 8.95 24.25) (end 8.95 -1.39) (layer F.SilkS) (width 0.12))
-    (fp_line (start 8.95 -1.39) (end -1.33 -1.39) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.55 -1.6) (end -1.55 24.45) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.55 24.45) (end 9.15 24.45) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 9.15 24.45) (end 9.15 -1.6) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 9.15 -1.6) (end -1.55 -1.6) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 3.81 2.54) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 thru_hole rect (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad 11 thru_hole oval (at 7.62 22.86) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 4 WRITE))
-    (pad 2 thru_hole oval (at 0 2.54) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 54 /OUT_D0_UP))
-    (pad 12 thru_hole oval (at 7.62 20.32) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 58 /OUT_D4_FIRE0))
-    (pad 3 thru_hole oval (at 0 5.08) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 30 /D0))
-    (pad 13 thru_hole oval (at 7.62 17.78) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 34 /D4))
-    (pad 4 thru_hole oval (at 0 7.62) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 31 /D1))
-    (pad 14 thru_hole oval (at 7.62 15.24) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 35 /D5))
-    (pad 5 thru_hole oval (at 0 10.16) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 55 /OUT_D1_DOWN))
-    (pad 15 thru_hole oval (at 7.62 12.7) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 59 /OUT_D5_FIRE1))
-    (pad 6 thru_hole oval (at 0 12.7) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 56 /OUT_D2_LEFT))
-    (pad 16 thru_hole oval (at 7.62 10.16) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 60 /OUT_D6_FIRE2))
-    (pad 7 thru_hole oval (at 0 15.24) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 32 /D2))
-    (pad 17 thru_hole oval (at 7.62 7.62) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 36 /D6))
-    (pad 8 thru_hole oval (at 0 17.78) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 33 /D3))
-    (pad 18 thru_hole oval (at 7.62 5.08) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 37 /D7))
-    (pad 9 thru_hole oval (at 0 20.32) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 57 /OUT_D3_RIGHT))
-    (pad 19 thru_hole oval (at 7.62 2.54) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 61 /OUT_D7))
-    (pad 10 thru_hole oval (at 0 22.86) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 1 GND))
-    (pad 20 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
-      (net 2 VCC))
-    (model ${KISYS3DMOD}/Housings_DIP.3dshapes/DIP-20_W7.62mm_Socket.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Housings_DIP:DIP-16_W7.62mm_Socket (layer F.Cu) (tedit 5C61C5A4) (tstamp 5C616AA2)
     (at 123.19 117.475)
     (descr "16-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils), Socket")
@@ -2789,6 +2705,90 @@
     )
   )
 
+  (module Housings_DIP:DIP-20_W7.62mm_Socket (layer F.Cu) (tedit 5C7C5A51) (tstamp 5C7C5B8B)
+    (at 78.74 112.395)
+    (descr "20-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils), Socket")
+    (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil Socket")
+    (path /5C7C91B5)
+    (fp_text reference U2 (at 3.81 2.54) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 74LS374 (at 3.81 11.43 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 -1.27) (end 6.985 24.13) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 24.13) (end 0.635 24.13) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 24.13) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 -1.33) (end -1.27 24.19) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 24.19) (end 8.89 24.19) (layer F.Fab) (width 0.1))
+    (fp_line (start 8.89 24.19) (end 8.89 -1.33) (layer F.Fab) (width 0.1))
+    (fp_line (start 8.89 -1.33) (end -1.27 -1.33) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.81 -1.33) (end 1.16 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.16 -1.33) (end 1.16 24.19) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.16 24.19) (end 6.46 24.19) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.46 24.19) (end 6.46 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.46 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 -1.39) (end -1.33 24.25) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 24.25) (end 8.95 24.25) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.95 24.25) (end 8.95 -1.39) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.95 -1.39) (end -1.33 -1.39) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.55 -1.6) (end -1.55 24.45) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.55 24.45) (end 9.15 24.45) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.15 24.45) (end 9.15 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.15 -1.6) (end -1.55 -1.6) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 3.81 2.54) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole rect (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad 11 thru_hole oval (at 7.62 22.86) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 4 WRITE))
+    (pad 2 thru_hole oval (at 0 2.54) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 54 /OUT_D0_UP))
+    (pad 12 thru_hole oval (at 7.62 20.32) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 58 /OUT_D4_FIRE0))
+    (pad 3 thru_hole oval (at 0 5.08) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 30 /D0))
+    (pad 13 thru_hole oval (at 7.62 17.78) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 34 /D4))
+    (pad 4 thru_hole oval (at 0 7.62) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 31 /D1))
+    (pad 14 thru_hole oval (at 7.62 15.24) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 35 /D5))
+    (pad 5 thru_hole oval (at 0 10.16) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 55 /OUT_D1_DOWN))
+    (pad 15 thru_hole oval (at 7.62 12.7) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 59 /OUT_D5_FIRE1))
+    (pad 6 thru_hole oval (at 0 12.7) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 56 /OUT_D2_LEFT))
+    (pad 16 thru_hole oval (at 7.62 10.16) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 60 /OUT_D6_FIRE2))
+    (pad 7 thru_hole oval (at 0 15.24) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 32 /D2))
+    (pad 17 thru_hole oval (at 7.62 7.62) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 36 /D6))
+    (pad 8 thru_hole oval (at 0 17.78) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 33 /D3))
+    (pad 18 thru_hole oval (at 7.62 5.08) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 37 /D7))
+    (pad 9 thru_hole oval (at 0 20.32) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 57 /OUT_D3_RIGHT))
+    (pad 19 thru_hole oval (at 7.62 2.54) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 61 /OUT_D7))
+    (pad 10 thru_hole oval (at 0 22.86) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 GND))
+    (pad 20 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
+      (net 2 VCC))
+    (model ${KISYS3DMOD}/Housings_DIP.3dshapes/DIP-20_W7.62mm_Socket.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
   (gr_line (start 135.255 127.635) (end 137.795 127.635) (angle 90) (layer B.SilkS) (width 0.2))
   (gr_line (start 135.255 117.475) (end 137.795 117.475) (angle 90) (layer B.SilkS) (width 0.2))
   (gr_line (start 156.21 122.555) (end 158.75 122.555) (angle 90) (layer B.SilkS) (width 0.2))
@@ -2832,7 +2832,7 @@
   (gr_line (start 151.13 81.28) (end 76.2 81.28) (angle 90) (layer Edge.Cuts) (width 0.15))
   (gr_line (start 175.26 103.505) (end 175.26 96.52) (angle 90) (layer Edge.Cuts) (width 0.15))
   (gr_line (start 164.465 94.615) (end 173.355 94.615) (angle 90) (layer Edge.Cuts) (width 0.15))
-  (gr_text "RC6502\nDigital I/O\n& Joystick\nRevision A" (at 112.395 124.46) (layer F.SilkS)
+  (gr_text "RC6502\nDigital I/O\n& Joystick\nRevision B" (at 112.395 124.46) (layer F.SilkS)
     (effects (font (size 1.5 1.5) (thickness 0.3)))
   )
   (gr_text $xC00 (at 127 135.255) (layer B.SilkS)
diff --git a/RC6502 Joystick/RC6502 Joystick.net b/RC6502 Joystick/RC6502 Joystick.net
index 4a02520..d9f41cf 100644
--- a/RC6502 Joystick/RC6502 Joystick.net	
+++ b/RC6502 Joystick/RC6502 Joystick.net	
@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source "D:/owncloud/Documents/Projects/RC6502/RC6502 Joystick/RC6502 Joystick.sch")
-    (date "11/02/2019 15:30:15")
+    (date "03/03/2019 23:49:46")
     (tool "Eeschema 4.0.7")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -45,12 +45,6 @@
       (libsource (lib conn) (part Conn_02x08_Odd_Even))
       (sheetpath (names /) (tstamps /))
       (tstamp 5C22CCC7))
-    (comp (ref U2)
-      (value 74LS373)
-      (footprint Housings_DIP:DIP-20_W7.62mm_Socket)
-      (libsource (lib 74xx) (part 74LS373))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5C237A24))
     (comp (ref U1)
       (value 74LS245)
       (footprint Housings_DIP:DIP-20_W7.62mm_Socket)
@@ -278,7 +272,13 @@
       (footprint Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
-      (tstamp 5C62D743)))
+      (tstamp 5C62D743))
+    (comp (ref U2)
+      (value 74LS374)
+      (footprint Housings_DIP:DIP-20_W7.62mm_Socket)
+      (libsource (lib 74xx) (part 74LS374))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5C7C91B5)))
   (libparts
     (libpart (lib 74xx) (part 74LS138)
       (description "Decoder 3 to 8 (active low outputs)")
@@ -330,11 +330,11 @@
         (pin (num 18) (name B0) (type 3state))
         (pin (num 19) (name CE) (type input))
         (pin (num 20) (name VCC) (type power_in))))
-    (libpart (lib 74xx) (part 74LS373)
-      (description "8 bits Latch, 3 state Out")
+    (libpart (lib 74xx) (part 74LS374)
+      (description "8 bits Register, 3 state Out")
       (fields
         (field (name Reference) U)
-        (field (name Value) 74LS373))
+        (field (name Value) 74LS374))
       (pins
         (pin (num 1) (name OE) (type input))
         (pin (num 2) (name O0) (type 3state))
@@ -346,7 +346,7 @@
         (pin (num 8) (name D3) (type input))
         (pin (num 9) (name O3) (type 3state))
         (pin (num 10) (name GND) (type power_in))
-        (pin (num 11) (name LE) (type input))
+        (pin (num 11) (name Cp) (type input))
         (pin (num 12) (name O4) (type 3state))
         (pin (num 13) (name D4) (type input))
         (pin (num 14) (name D5) (type input))
@@ -370,8 +370,8 @@
         (pin (num 4) (name 4) (type passive))
         (pin (num 5) (name 5) (type passive))
         (pin (num 6) (name 6) (type passive))
-        (pin (num 7) (name 7) (type power_out))
-        (pin (num 8) (name 8) (type power_out))
+        (pin (num 7) (name 7) (type power_in))
+        (pin (num 8) (name 8) (type power_in))
         (pin (num 9) (name 9) (type passive))))
     (libpart (lib device) (part C)
       (description "Unpolarized capacitor")
@@ -493,322 +493,322 @@
         (pin (num 1) (name 1) (type passive))
         (pin (num 2) (name 2) (type passive)))))
   (libraries
-    (library (logical 74xx)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\74xx.lib"))
     (library (logical conn)
       (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\conn.lib"))
-    (library (logical device)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\device.lib"))
-    (library (logical switches)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\switches.lib"))
     (library (logical rc6502_backplane)
       (uri D:\ownCloud\Documents\Projects\RC6502\Templates\rc6502_backplane.lib))
     (library (logical atari_joystick)
-      (uri D:\owncloud\Documents\Projects\RC6502\Templates\atari_joystick.lib)))
+      (uri D:\owncloud\Documents\Projects\RC6502\Templates\atari_joystick.lib))
+    (library (logical switches)
+      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\switches.lib"))
+    (library (logical 74xx)
+      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\74xx.lib"))
+    (library (logical device)
+      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\device.lib")))
   (nets
-    (net (code 1) (name "Net-(D8-Pad2)")
-      (node (ref R16) (pin 1))
-      (node (ref D8) (pin 2)))
-    (net (code 2) (name "Net-(D7-Pad2)")
-      (node (ref D7) (pin 2))
-      (node (ref R15) (pin 1)))
-    (net (code 3) (name READ)
-      (node (ref J2) (pin 16))
-      (node (ref J2) (pin 14))
-      (node (ref U1) (pin 19))
-      (node (ref J2) (pin 12))
-      (node (ref J2) (pin 10)))
-    (net (code 4) (name "Net-(D6-Pad2)")
-      (node (ref R14) (pin 1))
-      (node (ref D6) (pin 2)))
-    (net (code 5) (name "Net-(D5-Pad2)")
-      (node (ref R13) (pin 1))
-      (node (ref D5) (pin 2)))
-    (net (code 6) (name "Net-(D4-Pad2)")
-      (node (ref R12) (pin 1))
-      (node (ref D4) (pin 2)))
-    (net (code 7) (name "Net-(D3-Pad2)")
-      (node (ref R11) (pin 1))
-      (node (ref D3) (pin 2)))
-    (net (code 8) (name VCC)
-      (node (ref SW3) (pin 2))
-      (node (ref SW7) (pin 2))
-      (node (ref SW6) (pin 2))
-      (node (ref SW5) (pin 2))
-      (node (ref SW4) (pin 2))
-      (node (ref SW8) (pin 2))
-      (node (ref SW2) (pin 2))
-      (node (ref SW1) (pin 2))
-      (node (ref U3) (pin 16))
-      (node (ref U4) (pin 16))
-      (node (ref J4) (pin 18))
-      (node (ref C4) (pin 1))
-      (node (ref J1) (pin 7))
-      (node (ref C3) (pin 1))
-      (node (ref C2) (pin 1))
-      (node (ref C1) (pin 1))
-      (node (ref U2) (pin 20))
-      (node (ref U1) (pin 20)))
-    (net (code 9) (name "Net-(D2-Pad2)")
-      (node (ref D2) (pin 2))
-      (node (ref R10) (pin 1)))
-    (net (code 10) (name "Net-(D1-Pad2)")
-      (node (ref D1) (pin 2))
-      (node (ref R9) (pin 1)))
-    (net (code 11) (name WRITE)
-      (node (ref J2) (pin 8))
+    (net (code 1) (name WRITE)
       (node (ref J2) (pin 6))
       (node (ref U2) (pin 11))
       (node (ref J2) (pin 2))
-      (node (ref J2) (pin 4)))
-    (net (code 12) (name /IN_D7)
-      (node (ref SW8) (pin 1))
-      (node (ref U1) (pin 11))
-      (node (ref R8) (pin 1)))
-    (net (code 13) (name /OUT_D7)
+      (node (ref J2) (pin 4))
+      (node (ref J2) (pin 8)))
+    (net (code 2) (name "Net-(D4-Pad2)")
+      (node (ref D4) (pin 2))
+      (node (ref R12) (pin 1)))
+    (net (code 3) (name "Net-(D3-Pad2)")
+      (node (ref D3) (pin 2))
+      (node (ref R11) (pin 1)))
+    (net (code 4) (name "Net-(D2-Pad2)")
+      (node (ref D2) (pin 2))
+      (node (ref R10) (pin 1)))
+    (net (code 5) (name "Net-(D1-Pad2)")
+      (node (ref D1) (pin 2))
+      (node (ref R9) (pin 1)))
+    (net (code 6) (name "Net-(D5-Pad2)")
+      (node (ref D5) (pin 2))
+      (node (ref R13) (pin 1)))
+    (net (code 7) (name "Net-(D8-Pad2)")
+      (node (ref R16) (pin 1))
+      (node (ref D8) (pin 2)))
+    (net (code 8) (name "Net-(D7-Pad2)")
+      (node (ref R15) (pin 1))
+      (node (ref D7) (pin 2)))
+    (net (code 9) (name "Net-(D6-Pad2)")
+      (node (ref D6) (pin 2))
+      (node (ref R14) (pin 1)))
+    (net (code 10) (name READ)
+      (node (ref J2) (pin 16))
+      (node (ref U1) (pin 19))
+      (node (ref J2) (pin 14))
+      (node (ref J2) (pin 12))
+      (node (ref J2) (pin 10)))
+    (net (code 11) (name /OUT_D7)
       (node (ref R16) (pin 2))
       (node (ref U2) (pin 19)))
-    (net (code 14) (name /OUT_D0_UP)
-      (node (ref R9) (pin 2))
-      (node (ref U2) (pin 2)))
-    (net (code 15) (name /OUT_D1_DOWN)
-      (node (ref R10) (pin 2))
-      (node (ref U2) (pin 5)))
-    (net (code 16) (name /OUT_D2_LEFT)
+    (net (code 12) (name /IN_D6_FIRE2)
+      (node (ref R7) (pin 1))
+      (node (ref J1) (pin 5))
+      (node (ref SW7) (pin 1))
+      (node (ref U1) (pin 12)))
+    (net (code 13) (name /OUT_D2_LEFT)
       (node (ref U2) (pin 6))
       (node (ref R11) (pin 2)))
-    (net (code 17) (name /OUT_D3_RIGHT)
-      (node (ref U2) (pin 9))
-      (node (ref R12) (pin 2)))
-    (net (code 18) (name /OUT_D4_FIRE0)
+    (net (code 14) (name /OUT_D3_RIGHT)
+      (node (ref R12) (pin 2))
+      (node (ref U2) (pin 9)))
+    (net (code 15) (name /OUT_D4_FIRE0)
       (node (ref R13) (pin 2))
       (node (ref U2) (pin 12)))
-    (net (code 19) (name /OUT_D5_FIRE1)
+    (net (code 16) (name /OUT_D5_FIRE1)
       (node (ref R14) (pin 2))
       (node (ref U2) (pin 15)))
-    (net (code 20) (name /OUT_D6_FIRE2)
-      (node (ref U2) (pin 16))
-      (node (ref R15) (pin 2)))
-    (net (code 21) (name "Net-(J3-Pad10)")
-      (node (ref J3) (pin 6))
-      (node (ref J3) (pin 10))
-      (node (ref J3) (pin 8))
-      (node (ref J3) (pin 12))
-      (node (ref J3) (pin 16))
-      (node (ref J3) (pin 14))
-      (node (ref U3) (pin 4))
-      (node (ref J3) (pin 2))
-      (node (ref J3) (pin 4)))
-    (net (code 22) (name "Net-(J2-Pad11)")
-      (node (ref J2) (pin 11))
-      (node (ref U3) (pin 10)))
-    (net (code 23) (name "Net-(J2-Pad9)")
-      (node (ref J2) (pin 9))
-      (node (ref U3) (pin 11)))
-    (net (code 24) (name "Net-(J2-Pad7)")
-      (node (ref U3) (pin 12))
-      (node (ref J2) (pin 7)))
-    (net (code 25) (name "Net-(J2-Pad5)")
-      (node (ref U3) (pin 13))
-      (node (ref J2) (pin 5)))
-    (net (code 26) (name "Net-(J2-Pad3)")
-      (node (ref U3) (pin 14))
-      (node (ref J2) (pin 3)))
-    (net (code 27) (name "Net-(J2-Pad1)")
-      (node (ref J2) (pin 1))
-      (node (ref U3) (pin 15)))
-    (net (code 28) (name "Net-(J3-Pad9)")
-      (node (ref U4) (pin 11))
-      (node (ref J3) (pin 9)))
-    (net (code 29) (name "Net-(J3-Pad13)")
-      (node (ref U4) (pin 9))
-      (node (ref J3) (pin 13)))
-    (net (code 30) (name "Net-(J3-Pad11)")
-      (node (ref U4) (pin 10))
-      (node (ref J3) (pin 11)))
-    (net (code 31) (name "Net-(J3-Pad15)")
+    (net (code 17) (name /OUT_D6_FIRE2)
+      (node (ref R15) (pin 2))
+      (node (ref U2) (pin 16)))
+    (net (code 18) (name /OUT_D0_UP)
+      (node (ref U2) (pin 2))
+      (node (ref R9) (pin 2)))
+    (net (code 19) (name /OUT_D1_DOWN)
+      (node (ref R10) (pin 2))
+      (node (ref U2) (pin 5)))
+    (net (code 20) (name /IN_D7)
+      (node (ref R8) (pin 1))
+      (node (ref U1) (pin 11))
+      (node (ref SW8) (pin 1)))
+    (net (code 21) (name "Net-(J3-Pad15)")
       (node (ref U4) (pin 7))
       (node (ref J3) (pin 15)))
-    (net (code 32) (name "Net-(J3-Pad7)")
+    (net (code 22) (name "Net-(J3-Pad10)")
+      (node (ref U3) (pin 4))
+      (node (ref J3) (pin 14))
+      (node (ref J3) (pin 12))
+      (node (ref J3) (pin 10))
+      (node (ref J3) (pin 2))
+      (node (ref J3) (pin 16))
+      (node (ref J3) (pin 4))
+      (node (ref J3) (pin 6))
+      (node (ref J3) (pin 8)))
+    (net (code 23) (name "Net-(J3-Pad13)")
+      (node (ref J3) (pin 13))
+      (node (ref U4) (pin 9)))
+    (net (code 24) (name "Net-(J3-Pad11)")
+      (node (ref J3) (pin 11))
+      (node (ref U4) (pin 10)))
+    (net (code 25) (name "Net-(J3-Pad9)")
+      (node (ref J3) (pin 9))
+      (node (ref U4) (pin 11)))
+    (net (code 26) (name "Net-(J3-Pad7)")
       (node (ref J3) (pin 7))
       (node (ref U4) (pin 12)))
-    (net (code 33) (name "Net-(J3-Pad5)")
+    (net (code 27) (name "Net-(J3-Pad5)")
       (node (ref U4) (pin 13))
       (node (ref J3) (pin 5)))
-    (net (code 34) (name "Net-(J3-Pad3)")
+    (net (code 28) (name "Net-(J3-Pad3)")
       (node (ref J3) (pin 3))
       (node (ref U4) (pin 14)))
-    (net (code 35) (name "Net-(J3-Pad1)")
+    (net (code 29) (name "Net-(J3-Pad1)")
       (node (ref U4) (pin 15))
       (node (ref J3) (pin 1)))
-    (net (code 36) (name "Net-(J2-Pad13)")
-      (node (ref J2) (pin 13))
-      (node (ref U3) (pin 9)))
-    (net (code 37) (name GND)
-      (node (ref U1) (pin 1))
-      (node (ref D4) (pin 1))
-      (node (ref D1) (pin 1))
-      (node (ref D3) (pin 1))
-      (node (ref D2) (pin 1))
-      (node (ref D6) (pin 1))
-      (node (ref D5) (pin 1))
-      (node (ref D8) (pin 1))
-      (node (ref D7) (pin 1))
-      (node (ref U3) (pin 8))
-      (node (ref R6) (pin 2))
-      (node (ref U4) (pin 8))
-      (node (ref U4) (pin 5))
+    (net (code 30) (name GND)
       (node (ref U4) (pin 4))
       (node (ref J4) (pin 17))
-      (node (ref R4) (pin 2))
-      (node (ref R1) (pin 2))
-      (node (ref R2) (pin 2))
       (node (ref U3) (pin 5))
-      (node (ref R3) (pin 2))
-      (node (ref R7) (pin 2))
-      (node (ref R5) (pin 2))
-      (node (ref U1) (pin 10))
-      (node (ref U2) (pin 1))
-      (node (ref J1) (pin 8))
+      (node (ref U3) (pin 8))
+      (node (ref R8) (pin 2))
+      (node (ref U4) (pin 5))
+      (node (ref U4) (pin 8))
+      (node (ref D5) (pin 1))
       (node (ref U2) (pin 10))
-      (node (ref C3) (pin 2))
+      (node (ref D4) (pin 1))
+      (node (ref R5) (pin 2))
+      (node (ref R7) (pin 2))
+      (node (ref R4) (pin 2))
+      (node (ref R6) (pin 2))
+      (node (ref D3) (pin 1))
+      (node (ref D2) (pin 1))
+      (node (ref D1) (pin 1))
+      (node (ref J1) (pin 8))
       (node (ref C2) (pin 2))
       (node (ref C1) (pin 2))
+      (node (ref D6) (pin 1))
+      (node (ref C3) (pin 2))
       (node (ref C4) (pin 2))
-      (node (ref R8) (pin 2)))
-    (net (code 38) (name /IN_D5_FIRE1)
-      (node (ref SW6) (pin 1))
-      (node (ref J1) (pin 9))
+      (node (ref R2) (pin 2))
+      (node (ref R1) (pin 2))
+      (node (ref D7) (pin 1))
+      (node (ref U1) (pin 10))
+      (node (ref U1) (pin 1))
+      (node (ref U2) (pin 1))
+      (node (ref R3) (pin 2))
+      (node (ref D8) (pin 1)))
+    (net (code 31) (name VCC)
+      (node (ref SW6) (pin 2))
+      (node (ref U1) (pin 20))
+      (node (ref SW8) (pin 2))
+      (node (ref SW3) (pin 2))
+      (node (ref J1) (pin 7))
+      (node (ref SW7) (pin 2))
+      (node (ref J4) (pin 18))
+      (node (ref U3) (pin 16))
+      (node (ref U2) (pin 20))
+      (node (ref SW2) (pin 2))
+      (node (ref SW1) (pin 2))
+      (node (ref U4) (pin 16))
+      (node (ref C1) (pin 1))
+      (node (ref C2) (pin 1))
+      (node (ref C3) (pin 1))
+      (node (ref SW5) (pin 2))
+      (node (ref C4) (pin 1))
+      (node (ref SW4) (pin 2)))
+    (net (code 32) (name "Net-(J2-Pad3)")
+      (node (ref J2) (pin 3))
+      (node (ref U3) (pin 14)))
+    (net (code 33) (name "Net-(J2-Pad1)")
+      (node (ref J2) (pin 1))
+      (node (ref U3) (pin 15)))
+    (net (code 34) (name "Net-(J2-Pad5)")
+      (node (ref J2) (pin 5))
+      (node (ref U3) (pin 13)))
+    (net (code 35) (name /IN_D5_FIRE1)
+      (node (ref U1) (pin 13))
       (node (ref R6) (pin 1))
-      (node (ref U1) (pin 13)))
-    (net (code 39) (name /IN_D6_FIRE2)
-      (node (ref J1) (pin 5))
-      (node (ref U1) (pin 12))
-      (node (ref SW7) (pin 1))
-      (node (ref R7) (pin 1)))
-    (net (code 40) (name /IN_D3_RIGHT)
-      (node (ref R5) (pin 1))
-      (node (ref SW4) (pin 1))
-      (node (ref J1) (pin 4))
-      (node (ref U1) (pin 15)))
-    (net (code 41) (name /IN_D2_LEFT)
-      (node (ref J1) (pin 3))
-      (node (ref U1) (pin 16))
-      (node (ref R4) (pin 1))
-      (node (ref SW3) (pin 1)))
-    (net (code 42) (name /IN_D1_DOWN)
-      (node (ref R3) (pin 1))
-      (node (ref U1) (pin 17))
-      (node (ref J1) (pin 2))
-      (node (ref SW2) (pin 1)))
-    (net (code 43) (name /IN_D4_FIRE0)
-      (node (ref U1) (pin 14))
-      (node (ref R2) (pin 1))
-      (node (ref J1) (pin 6))
-      (node (ref SW5) (pin 1)))
-    (net (code 44) (name /IN_D0_UP)
-      (node (ref R1) (pin 1))
-      (node (ref U1) (pin 18))
-      (node (ref SW1) (pin 1))
-      (node (ref J1) (pin 1)))
-    (net (code 45) (name "Net-(J2-Pad15)")
-      (node (ref J2) (pin 15))
-      (node (ref U3) (pin 7)))
-    (net (code 46) (name /A12)
-      (node (ref J4) (pin 4))
-      (node (ref U4) (pin 1)))
-    (net (code 47) (name /A15)
-      (node (ref J4) (pin 1))
-      (node (ref U4) (pin 6)))
-    (net (code 48) (name /A14)
-      (node (ref U4) (pin 3))
-      (node (ref J4) (pin 2)))
-    (net (code 49) (name /A13)
+      (node (ref J1) (pin 9))
+      (node (ref SW6) (pin 1)))
+    (net (code 36) (name "Net-(J2-Pad15)")
+      (node (ref U3) (pin 7))
+      (node (ref J2) (pin 15)))
+    (net (code 37) (name "Net-(J2-Pad13)")
+      (node (ref U3) (pin 9))
+      (node (ref J2) (pin 13)))
+    (net (code 38) (name "Net-(J2-Pad11)")
+      (node (ref U3) (pin 10))
+      (node (ref J2) (pin 11)))
+    (net (code 39) (name "Net-(J2-Pad9)")
+      (node (ref U3) (pin 11))
+      (node (ref J2) (pin 9)))
+    (net (code 40) (name "Net-(J2-Pad7)")
+      (node (ref U3) (pin 12))
+      (node (ref J2) (pin 7)))
+    (net (code 41) (name /A12)
+      (node (ref U4) (pin 1))
+      (node (ref J4) (pin 4)))
+    (net (code 42) (name /A15)
+      (node (ref U4) (pin 6))
+      (node (ref J4) (pin 1)))
+    (net (code 43) (name /A14)
+      (node (ref J4) (pin 2))
+      (node (ref U4) (pin 3)))
+    (net (code 44) (name /A13)
       (node (ref J4) (pin 3))
       (node (ref U4) (pin 2)))
-    (net (code 50) (name /A10)
+    (net (code 45) (name /A10)
       (node (ref J4) (pin 6))
       (node (ref U3) (pin 1)))
-    (net (code 51) (name /A11)
-      (node (ref U3) (pin 2))
-      (node (ref J4) (pin 5)))
-    (net (code 52) (name /Phi2)
+    (net (code 46) (name /A11)
+      (node (ref J4) (pin 5))
+      (node (ref U3) (pin 2)))
+    (net (code 47) (name /Phi2)
       (node (ref J4) (pin 19))
       (node (ref U3) (pin 6)))
-    (net (code 53) (name /D5)
-      (node (ref J4) (pin 32))
+    (net (code 48) (name /D5)
+      (node (ref U2) (pin 14))
       (node (ref U1) (pin 7))
-      (node (ref U2) (pin 14)))
-    (net (code 54) (name /D6)
-      (node (ref J4) (pin 33))
+      (node (ref J4) (pin 32)))
+    (net (code 49) (name /D6)
       (node (ref U1) (pin 8))
-      (node (ref U2) (pin 17)))
-    (net (code 55) (name /D7)
+      (node (ref U2) (pin 17))
+      (node (ref J4) (pin 33)))
+    (net (code 50) (name /D7)
       (node (ref U2) (pin 18))
       (node (ref J4) (pin 34))
       (node (ref U1) (pin 9)))
-    (net (code 56) (name /D4)
+    (net (code 51) (name /D4)
       (node (ref U1) (pin 6))
       (node (ref U2) (pin 13))
       (node (ref J4) (pin 31)))
-    (net (code 57) (name "Net-(J4-Pad25)")
+    (net (code 52) (name "Net-(J4-Pad25)")
       (node (ref J4) (pin 25)))
-    (net (code 58) (name /R/~W)
+    (net (code 53) (name /R/~W)
       (node (ref U3) (pin 3))
       (node (ref J4) (pin 24)))
-    (net (code 59) (name "Net-(J4-Pad35)")
+    (net (code 54) (name "Net-(J4-Pad35)")
       (node (ref J4) (pin 35)))
-    (net (code 60) (name "Net-(J4-Pad36)")
+    (net (code 55) (name "Net-(J4-Pad36)")
       (node (ref J4) (pin 36)))
-    (net (code 61) (name "Net-(J4-Pad37)")
+    (net (code 56) (name "Net-(J4-Pad37)")
       (node (ref J4) (pin 37)))
-    (net (code 62) (name "Net-(J4-Pad26)")
+    (net (code 57) (name "Net-(J4-Pad26)")
       (node (ref J4) (pin 26)))
-    (net (code 63) (name "Net-(J4-Pad22)")
+    (net (code 58) (name "Net-(J4-Pad22)")
       (node (ref J4) (pin 22)))
-    (net (code 64) (name "Net-(J4-Pad20)")
+    (net (code 59) (name "Net-(J4-Pad20)")
       (node (ref J4) (pin 20)))
-    (net (code 65) (name /D0)
+    (net (code 60) (name /D0)
+      (node (ref J4) (pin 27))
       (node (ref U2) (pin 3))
-      (node (ref U1) (pin 2))
-      (node (ref J4) (pin 27)))
-    (net (code 66) (name /D1)
+      (node (ref U1) (pin 2)))
+    (net (code 61) (name /D1)
       (node (ref U1) (pin 3))
-      (node (ref U2) (pin 4))
-      (node (ref J4) (pin 28)))
-    (net (code 67) (name /D2)
-      (node (ref U2) (pin 7))
+      (node (ref J4) (pin 28))
+      (node (ref U2) (pin 4)))
+    (net (code 62) (name /D2)
       (node (ref U1) (pin 4))
+      (node (ref U2) (pin 7))
       (node (ref J4) (pin 29)))
-    (net (code 68) (name /D3)
+    (net (code 63) (name /D3)
+      (node (ref U2) (pin 8))
       (node (ref J4) (pin 30))
-      (node (ref U1) (pin 5))
-      (node (ref U2) (pin 8)))
-    (net (code 69) (name "Net-(J4-Pad13)")
+      (node (ref U1) (pin 5)))
+    (net (code 64) (name "Net-(J4-Pad13)")
       (node (ref J4) (pin 13)))
-    (net (code 70) (name "Net-(J4-Pad23)")
+    (net (code 65) (name "Net-(J4-Pad23)")
       (node (ref J4) (pin 23)))
-    (net (code 71) (name "Net-(J4-Pad14)")
+    (net (code 66) (name "Net-(J4-Pad14)")
       (node (ref J4) (pin 14)))
-    (net (code 72) (name "Net-(J4-Pad15)")
+    (net (code 67) (name "Net-(J4-Pad15)")
       (node (ref J4) (pin 15)))
-    (net (code 73) (name "Net-(J4-Pad16)")
+    (net (code 68) (name "Net-(J4-Pad16)")
       (node (ref J4) (pin 16)))
-    (net (code 74) (name "Net-(J4-Pad10)")
+    (net (code 69) (name "Net-(J4-Pad10)")
       (node (ref J4) (pin 10)))
-    (net (code 75) (name "Net-(J4-Pad7)")
+    (net (code 70) (name "Net-(J4-Pad7)")
       (node (ref J4) (pin 7)))
-    (net (code 76) (name "Net-(J4-Pad8)")
+    (net (code 71) (name "Net-(J4-Pad8)")
       (node (ref J4) (pin 8)))
-    (net (code 77) (name "Net-(J4-Pad9)")
+    (net (code 72) (name "Net-(J4-Pad9)")
       (node (ref J4) (pin 9)))
-    (net (code 78) (name "Net-(J4-Pad38)")
+    (net (code 73) (name "Net-(J4-Pad38)")
       (node (ref J4) (pin 38)))
-    (net (code 79) (name "Net-(J4-Pad11)")
+    (net (code 74) (name "Net-(J4-Pad11)")
       (node (ref J4) (pin 11)))
-    (net (code 80) (name "Net-(J4-Pad21)")
+    (net (code 75) (name "Net-(J4-Pad21)")
       (node (ref J4) (pin 21)))
-    (net (code 81) (name "Net-(J4-Pad12)")
+    (net (code 76) (name "Net-(J4-Pad12)")
       (node (ref J4) (pin 12)))
-    (net (code 82) (name "Net-(J4-Pad39)")
-      (node (ref J4) (pin 39)))))
\ No newline at end of file
+    (net (code 77) (name "Net-(J4-Pad39)")
+      (node (ref J4) (pin 39)))
+    (net (code 78) (name /IN_D0_UP)
+      (node (ref J1) (pin 1))
+      (node (ref R1) (pin 1))
+      (node (ref U1) (pin 18))
+      (node (ref SW1) (pin 1)))
+    (net (code 79) (name /IN_D1_DOWN)
+      (node (ref U1) (pin 17))
+      (node (ref R3) (pin 1))
+      (node (ref SW2) (pin 1))
+      (node (ref J1) (pin 2)))
+    (net (code 80) (name /IN_D2_LEFT)
+      (node (ref U1) (pin 16))
+      (node (ref R4) (pin 1))
+      (node (ref SW3) (pin 1))
+      (node (ref J1) (pin 3)))
+    (net (code 81) (name /IN_D3_RIGHT)
+      (node (ref U1) (pin 15))
+      (node (ref J1) (pin 4))
+      (node (ref SW4) (pin 1))
+      (node (ref R5) (pin 1)))
+    (net (code 82) (name /IN_D4_FIRE0)
+      (node (ref SW5) (pin 1))
+      (node (ref U1) (pin 14))
+      (node (ref J1) (pin 6))
+      (node (ref R2) (pin 1)))))
\ No newline at end of file
diff --git a/RC6502 Joystick/RC6502 Joystick.pro b/RC6502 Joystick/RC6502 Joystick.pro
index 9c9f863..bab7c5d 100644
--- a/RC6502 Joystick/RC6502 Joystick.pro	
+++ b/RC6502 Joystick/RC6502 Joystick.pro	
@@ -1,4 +1,4 @@
-update=11/02/2019 11:50:23
+update=03/03/2019 23:52:36
 version=1
 last_client=kicad
 [pcbnew]
@@ -33,8 +33,6 @@ NetFmtName=Pcbnew
 SpiceForceRefPrefix=0
 SpiceUseNetNumbers=0
 LabSize=60
-[general]
-version=1
 [eeschema]
 version=1
 LibDir=
@@ -73,3 +71,5 @@ LibName31=contrib
 LibName32=valves
 LibName33=D:/ownCloud/Documents/Projects/RC6502/Templates/rc6502_backplane
 LibName34=D:/owncloud/Documents/Projects/RC6502/Templates/atari_joystick
+[general]
+version=1
diff --git a/RC6502 Joystick/RC6502 Joystick.sch b/RC6502 Joystick/RC6502 Joystick.sch
index 7fbb94f..ae49d6a 100644
--- a/RC6502 Joystick/RC6502 Joystick.sch	
+++ b/RC6502 Joystick/RC6502 Joystick.sch	
@@ -232,17 +232,6 @@ Text GLabel 6475 875  1    60   Output ~ 0
 WRITE
 Text GLabel 6975 875  1    60   Output ~ 0
 READ
-$Comp
-L 74LS373 U2
-U 1 1 5C237A24
-P 2125 4475
-F 0 "U2" H 2125 4475 50  0000 C CNN
-F 1 "74LS373" H 2175 4125 50  0000 C CNN
-F 2 "Housings_DIP:DIP-20_W7.62mm_Socket" H 2125 4475 50  0001 C CNN
-F 3 "" H 2125 4475 50  0001 C CNN
-	1    2125 4475
-	1    0    0    -1  
-$EndComp
 Entry Wire Line
 	1075 4675 975  4575
 Entry Wire Line
@@ -1294,4 +1283,15 @@ F 3 "" H 3700 4675 50  0001 C CNN
 $EndComp
 Text Notes 7025 6875 0    60   ~ 0
 Sort of a mish-mash digital I/O module, with a DB9 connector for use with Atari-style\njoysticks. Matches address decoding used by PSG so that they can coincide within the\nsame 4K address space.
+$Comp
+L 74LS374 U2
+U 1 1 5C7C91B5
+P 2125 4475
+F 0 "U2" H 2125 4475 50  0000 C CNN
+F 1 "74LS374" H 2175 4125 50  0000 C CNN
+F 2 "Housings_DIP:DIP-20_W7.62mm_Socket" H 2125 4475 50  0001 C CNN
+F 3 "" H 2125 4475 50  0001 C CNN
+	1    2125 4475
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/RC6502 Joystick/export/RC6502 Joystick-B.Cu.gbl b/RC6502 Joystick/export/RC6502 Joystick-B.Cu.gbl
index 37653b9..611bea8 100644
--- a/RC6502 Joystick/export/RC6502 Joystick-B.Cu.gbl	
+++ b/RC6502 Joystick/export/RC6502 Joystick-B.Cu.gbl	
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Copper,L2,Bot,Signal*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7) date 02/14/19 14:28:20*
+G04 Created by KiCad (PCBNEW 4.0.7) date 03/03/19 23:52:22*
 %MOMM*%
 %LPD*%
 G01*
@@ -273,28 +273,6 @@ X101600000Y-114935000D03*
 X93980000Y-135255000D03*
 X101600000Y-112395000D03*
 D17*
-X78740000Y-112395000D03*
-D14*
-X86360000Y-135255000D03*
-X78740000Y-114935000D03*
-X86360000Y-132715000D03*
-X78740000Y-117475000D03*
-X86360000Y-130175000D03*
-X78740000Y-120015000D03*
-X86360000Y-127635000D03*
-X78740000Y-122555000D03*
-X86360000Y-125095000D03*
-X78740000Y-125095000D03*
-X86360000Y-122555000D03*
-X78740000Y-127635000D03*
-X86360000Y-120015000D03*
-X78740000Y-130175000D03*
-X86360000Y-117475000D03*
-X78740000Y-132715000D03*
-X86360000Y-114935000D03*
-X78740000Y-135255000D03*
-X86360000Y-112395000D03*
-D17*
 X123190000Y-117475000D03*
 D14*
 X130810000Y-135255000D03*
@@ -330,6 +308,28 @@ X144145000Y-132715000D03*
 X151765000Y-120015000D03*
 X144145000Y-135255000D03*
 X151765000Y-117475000D03*
+D17*
+X78740000Y-112395000D03*
+D14*
+X86360000Y-135255000D03*
+X78740000Y-114935000D03*
+X86360000Y-132715000D03*
+X78740000Y-117475000D03*
+X86360000Y-130175000D03*
+X78740000Y-120015000D03*
+X86360000Y-127635000D03*
+X78740000Y-122555000D03*
+X86360000Y-125095000D03*
+X78740000Y-125095000D03*
+X86360000Y-122555000D03*
+X78740000Y-127635000D03*
+X86360000Y-120015000D03*
+X78740000Y-130175000D03*
+X86360000Y-117475000D03*
+X78740000Y-132715000D03*
+X86360000Y-114935000D03*
+X78740000Y-135255000D03*
+X86360000Y-112395000D03*
 D20*
 X85725000Y-102870000D03*
 X115570000Y-112395000D03*
diff --git a/RC6502 Joystick/export/RC6502 Joystick-B.Mask.gbs b/RC6502 Joystick/export/RC6502 Joystick-B.Mask.gbs
index 8e65c7f..8c57a99 100644
--- a/RC6502 Joystick/export/RC6502 Joystick-B.Mask.gbs	
+++ b/RC6502 Joystick/export/RC6502 Joystick-B.Mask.gbs	
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Soldermask,Bot*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7) date 02/14/19 14:28:20*
+G04 Created by KiCad (PCBNEW 4.0.7) date 03/03/19 23:52:22*
 %MOMM*%
 %LPD*%
 G01*
@@ -270,28 +270,6 @@ X101600000Y-114935000D03*
 X93980000Y-135255000D03*
 X101600000Y-112395000D03*
 D17*
-X78740000Y-112395000D03*
-D14*
-X86360000Y-135255000D03*
-X78740000Y-114935000D03*
-X86360000Y-132715000D03*
-X78740000Y-117475000D03*
-X86360000Y-130175000D03*
-X78740000Y-120015000D03*
-X86360000Y-127635000D03*
-X78740000Y-122555000D03*
-X86360000Y-125095000D03*
-X78740000Y-125095000D03*
-X86360000Y-122555000D03*
-X78740000Y-127635000D03*
-X86360000Y-120015000D03*
-X78740000Y-130175000D03*
-X86360000Y-117475000D03*
-X78740000Y-132715000D03*
-X86360000Y-114935000D03*
-X78740000Y-135255000D03*
-X86360000Y-112395000D03*
-D17*
 X123190000Y-117475000D03*
 D14*
 X130810000Y-135255000D03*
@@ -327,4 +305,26 @@ X144145000Y-132715000D03*
 X151765000Y-120015000D03*
 X144145000Y-135255000D03*
 X151765000Y-117475000D03*
+D17*
+X78740000Y-112395000D03*
+D14*
+X86360000Y-135255000D03*
+X78740000Y-114935000D03*
+X86360000Y-132715000D03*
+X78740000Y-117475000D03*
+X86360000Y-130175000D03*
+X78740000Y-120015000D03*
+X86360000Y-127635000D03*
+X78740000Y-122555000D03*
+X86360000Y-125095000D03*
+X78740000Y-125095000D03*
+X86360000Y-122555000D03*
+X78740000Y-127635000D03*
+X86360000Y-120015000D03*
+X78740000Y-130175000D03*
+X86360000Y-117475000D03*
+X78740000Y-132715000D03*
+X86360000Y-114935000D03*
+X78740000Y-135255000D03*
+X86360000Y-112395000D03*
 M02*
diff --git a/RC6502 Joystick/export/RC6502 Joystick-B.Paste.gbp b/RC6502 Joystick/export/RC6502 Joystick-B.Paste.gbp
index 042dbec..70169ed 100644
--- a/RC6502 Joystick/export/RC6502 Joystick-B.Paste.gbp	
+++ b/RC6502 Joystick/export/RC6502 Joystick-B.Paste.gbp	
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Paste,Bot*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7) date 02/14/19 14:28:20*
+G04 Created by KiCad (PCBNEW 4.0.7) date 03/03/19 23:52:22*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/RC6502 Joystick/export/RC6502 Joystick-B.SilkS.gbo b/RC6502 Joystick/export/RC6502 Joystick-B.SilkS.gbo
index 69a527a..2f62a9e 100644
--- a/RC6502 Joystick/export/RC6502 Joystick-B.SilkS.gbo	
+++ b/RC6502 Joystick/export/RC6502 Joystick-B.SilkS.gbo	
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Legend,Bot*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7) date 02/14/19 14:28:20*
+G04 Created by KiCad (PCBNEW 4.0.7) date 03/03/19 23:52:22*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/RC6502 Joystick/export/RC6502 Joystick-Dwgs.User.gbr b/RC6502 Joystick/export/RC6502 Joystick-Dwgs.User.gbr
index ca4d076..509f4a2 100644
--- a/RC6502 Joystick/export/RC6502 Joystick-Dwgs.User.gbr	
+++ b/RC6502 Joystick/export/RC6502 Joystick-Dwgs.User.gbr	
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Drawing*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7) date 02/14/19 14:28:20*
+G04 Created by KiCad (PCBNEW 4.0.7) date 03/03/19 23:52:22*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/RC6502 Joystick/export/RC6502 Joystick-Edge.Cuts.gm1 b/RC6502 Joystick/export/RC6502 Joystick-Edge.Cuts.gm1
index 994486c..5d91136 100644
--- a/RC6502 Joystick/export/RC6502 Joystick-Edge.Cuts.gm1	
+++ b/RC6502 Joystick/export/RC6502 Joystick-Edge.Cuts.gm1	
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Profile,NP*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7) date 02/14/19 14:28:20*
+G04 Created by KiCad (PCBNEW 4.0.7) date 03/03/19 23:52:23*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/RC6502 Joystick/export/RC6502 Joystick-F.Cu.gtl b/RC6502 Joystick/export/RC6502 Joystick-F.Cu.gtl
index 49920d5..031414e 100644
--- a/RC6502 Joystick/export/RC6502 Joystick-F.Cu.gtl	
+++ b/RC6502 Joystick/export/RC6502 Joystick-F.Cu.gtl	
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Copper,L1,Top,Signal*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7) date 02/14/19 14:28:20*
+G04 Created by KiCad (PCBNEW 4.0.7) date 03/03/19 23:52:22*
 %MOMM*%
 %LPD*%
 G01*
@@ -272,28 +272,6 @@ X101600000Y-114935000D03*
 X93980000Y-135255000D03*
 X101600000Y-112395000D03*
 D17*
-X78740000Y-112395000D03*
-D14*
-X86360000Y-135255000D03*
-X78740000Y-114935000D03*
-X86360000Y-132715000D03*
-X78740000Y-117475000D03*
-X86360000Y-130175000D03*
-X78740000Y-120015000D03*
-X86360000Y-127635000D03*
-X78740000Y-122555000D03*
-X86360000Y-125095000D03*
-X78740000Y-125095000D03*
-X86360000Y-122555000D03*
-X78740000Y-127635000D03*
-X86360000Y-120015000D03*
-X78740000Y-130175000D03*
-X86360000Y-117475000D03*
-X78740000Y-132715000D03*
-X86360000Y-114935000D03*
-X78740000Y-135255000D03*
-X86360000Y-112395000D03*
-D17*
 X123190000Y-117475000D03*
 D14*
 X130810000Y-135255000D03*
@@ -329,6 +307,28 @@ X144145000Y-132715000D03*
 X151765000Y-120015000D03*
 X144145000Y-135255000D03*
 X151765000Y-117475000D03*
+D17*
+X78740000Y-112395000D03*
+D14*
+X86360000Y-135255000D03*
+X78740000Y-114935000D03*
+X86360000Y-132715000D03*
+X78740000Y-117475000D03*
+X86360000Y-130175000D03*
+X78740000Y-120015000D03*
+X86360000Y-127635000D03*
+X78740000Y-122555000D03*
+X86360000Y-125095000D03*
+X78740000Y-125095000D03*
+X86360000Y-122555000D03*
+X78740000Y-127635000D03*
+X86360000Y-120015000D03*
+X78740000Y-130175000D03*
+X86360000Y-117475000D03*
+X78740000Y-132715000D03*
+X86360000Y-114935000D03*
+X78740000Y-135255000D03*
+X86360000Y-112395000D03*
 D20*
 X85725000Y-102870000D03*
 X115570000Y-112395000D03*
diff --git a/RC6502 Joystick/export/RC6502 Joystick-F.Mask.gts b/RC6502 Joystick/export/RC6502 Joystick-F.Mask.gts
index af0cd18..5d44e3f 100644
--- a/RC6502 Joystick/export/RC6502 Joystick-F.Mask.gts	
+++ b/RC6502 Joystick/export/RC6502 Joystick-F.Mask.gts	
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Soldermask,Top*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7) date 02/14/19 14:28:20*
+G04 Created by KiCad (PCBNEW 4.0.7) date 03/03/19 23:52:22*
 %MOMM*%
 %LPD*%
 G01*
@@ -270,28 +270,6 @@ X101600000Y-114935000D03*
 X93980000Y-135255000D03*
 X101600000Y-112395000D03*
 D17*
-X78740000Y-112395000D03*
-D14*
-X86360000Y-135255000D03*
-X78740000Y-114935000D03*
-X86360000Y-132715000D03*
-X78740000Y-117475000D03*
-X86360000Y-130175000D03*
-X78740000Y-120015000D03*
-X86360000Y-127635000D03*
-X78740000Y-122555000D03*
-X86360000Y-125095000D03*
-X78740000Y-125095000D03*
-X86360000Y-122555000D03*
-X78740000Y-127635000D03*
-X86360000Y-120015000D03*
-X78740000Y-130175000D03*
-X86360000Y-117475000D03*
-X78740000Y-132715000D03*
-X86360000Y-114935000D03*
-X78740000Y-135255000D03*
-X86360000Y-112395000D03*
-D17*
 X123190000Y-117475000D03*
 D14*
 X130810000Y-135255000D03*
@@ -327,4 +305,26 @@ X144145000Y-132715000D03*
 X151765000Y-120015000D03*
 X144145000Y-135255000D03*
 X151765000Y-117475000D03*
+D17*
+X78740000Y-112395000D03*
+D14*
+X86360000Y-135255000D03*
+X78740000Y-114935000D03*
+X86360000Y-132715000D03*
+X78740000Y-117475000D03*
+X86360000Y-130175000D03*
+X78740000Y-120015000D03*
+X86360000Y-127635000D03*
+X78740000Y-122555000D03*
+X86360000Y-125095000D03*
+X78740000Y-125095000D03*
+X86360000Y-122555000D03*
+X78740000Y-127635000D03*
+X86360000Y-120015000D03*
+X78740000Y-130175000D03*
+X86360000Y-117475000D03*
+X78740000Y-132715000D03*
+X86360000Y-114935000D03*
+X78740000Y-135255000D03*
+X86360000Y-112395000D03*
 M02*
diff --git a/RC6502 Joystick/export/RC6502 Joystick-F.Paste.gtp b/RC6502 Joystick/export/RC6502 Joystick-F.Paste.gtp
index a185026..92f4de1 100644
--- a/RC6502 Joystick/export/RC6502 Joystick-F.Paste.gtp	
+++ b/RC6502 Joystick/export/RC6502 Joystick-F.Paste.gtp	
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Paste,Top*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7) date 02/14/19 14:28:20*
+G04 Created by KiCad (PCBNEW 4.0.7) date 03/03/19 23:52:22*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/RC6502 Joystick/export/RC6502 Joystick-F.SilkS.gto b/RC6502 Joystick/export/RC6502 Joystick-F.SilkS.gto
index 12b583c..13b6b9f 100644
--- a/RC6502 Joystick/export/RC6502 Joystick-F.SilkS.gto	
+++ b/RC6502 Joystick/export/RC6502 Joystick-F.SilkS.gto	
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Legend,Top*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7) date 02/14/19 14:28:20*
+G04 Created by KiCad (PCBNEW 4.0.7) date 03/03/19 23:52:22*
 %MOMM*%
 %LPD*%
 G01*
@@ -757,98 +757,112 @@ X117645000Y-125842143D02*
 X118073571Y-126413571D01*
 X118073571Y-125413571D02*
 X117502143Y-125985000D01*
-X107752143Y-128963571D02*
-X107252143Y-128249286D01*
-X106895000Y-128963571D02*
-X106895000Y-127463571D01*
-X107466428Y-127463571D01*
-X107609286Y-127535000D01*
-X107680714Y-127606429D01*
-X107752143Y-127749286D01*
-X107752143Y-127963571D01*
-X107680714Y-128106429D01*
-X107609286Y-128177857D01*
-X107466428Y-128249286D01*
-X106895000Y-128249286D01*
-X108966428Y-128892143D02*
-X108823571Y-128963571D01*
-X108537857Y-128963571D01*
-X108395000Y-128892143D01*
-X108323571Y-128749286D01*
-X108323571Y-128177857D01*
-X108395000Y-128035000D01*
-X108537857Y-127963571D01*
-X108823571Y-127963571D01*
-X108966428Y-128035000D01*
-X109037857Y-128177857D01*
-X109037857Y-128320714D01*
-X108323571Y-128463571D01*
-X109537857Y-127963571D02*
-X109895000Y-128963571D01*
-X110252142Y-127963571D01*
-X110823571Y-128963571D02*
-X110823571Y-127963571D01*
-X110823571Y-127463571D02*
-X110752142Y-127535000D01*
-X110823571Y-127606429D01*
-X110894999Y-127535000D01*
-X110823571Y-127463571D01*
-X110823571Y-127606429D01*
-X111466428Y-128892143D02*
-X111609285Y-128963571D01*
-X111895000Y-128963571D01*
-X112037857Y-128892143D01*
-X112109285Y-128749286D01*
-X112109285Y-128677857D01*
-X112037857Y-128535000D01*
-X111895000Y-128463571D01*
-X111680714Y-128463571D01*
-X111537857Y-128392143D01*
-X111466428Y-128249286D01*
-X111466428Y-128177857D01*
-X111537857Y-128035000D01*
-X111680714Y-127963571D01*
-X111895000Y-127963571D01*
-X112037857Y-128035000D01*
-X112752143Y-128963571D02*
-X112752143Y-127963571D01*
-X112752143Y-127463571D02*
-X112680714Y-127535000D01*
-X112752143Y-127606429D01*
-X112823571Y-127535000D01*
-X112752143Y-127463571D01*
-X112752143Y-127606429D01*
-X113680715Y-128963571D02*
-X113537857Y-128892143D01*
-X113466429Y-128820714D01*
-X113395000Y-128677857D01*
-X113395000Y-128249286D01*
-X113466429Y-128106429D01*
-X113537857Y-128035000D01*
-X113680715Y-127963571D01*
-X113895000Y-127963571D01*
-X114037857Y-128035000D01*
-X114109286Y-128106429D01*
-X114180715Y-128249286D01*
-X114180715Y-128677857D01*
-X114109286Y-128820714D01*
-X114037857Y-128892143D01*
-X113895000Y-128963571D01*
-X113680715Y-128963571D01*
-X114823572Y-127963571D02*
-X114823572Y-128963571D01*
-X114823572Y-128106429D02*
-X114895000Y-128035000D01*
-X115037858Y-127963571D01*
-X115252143Y-127963571D01*
-X115395000Y-128035000D01*
-X115466429Y-128177857D01*
-X115466429Y-128963571D01*
-X117252143Y-128535000D02*
-X117966429Y-128535000D01*
-X117109286Y-128963571D02*
-X117609286Y-127463571D01*
-X118109286Y-128963571D01*
+X107645000Y-128963571D02*
+X107145000Y-128249286D01*
+X106787857Y-128963571D02*
+X106787857Y-127463571D01*
+X107359285Y-127463571D01*
+X107502143Y-127535000D01*
+X107573571Y-127606429D01*
+X107645000Y-127749286D01*
+X107645000Y-127963571D01*
+X107573571Y-128106429D01*
+X107502143Y-128177857D01*
+X107359285Y-128249286D01*
+X106787857Y-128249286D01*
+X108859285Y-128892143D02*
+X108716428Y-128963571D01*
+X108430714Y-128963571D01*
+X108287857Y-128892143D01*
+X108216428Y-128749286D01*
+X108216428Y-128177857D01*
+X108287857Y-128035000D01*
+X108430714Y-127963571D01*
+X108716428Y-127963571D01*
+X108859285Y-128035000D01*
+X108930714Y-128177857D01*
+X108930714Y-128320714D01*
+X108216428Y-128463571D01*
+X109430714Y-127963571D02*
+X109787857Y-128963571D01*
+X110144999Y-127963571D01*
+X110716428Y-128963571D02*
+X110716428Y-127963571D01*
+X110716428Y-127463571D02*
+X110644999Y-127535000D01*
+X110716428Y-127606429D01*
+X110787856Y-127535000D01*
+X110716428Y-127463571D01*
+X110716428Y-127606429D01*
+X111359285Y-128892143D02*
+X111502142Y-128963571D01*
+X111787857Y-128963571D01*
+X111930714Y-128892143D01*
+X112002142Y-128749286D01*
+X112002142Y-128677857D01*
+X111930714Y-128535000D01*
+X111787857Y-128463571D01*
+X111573571Y-128463571D01*
+X111430714Y-128392143D01*
+X111359285Y-128249286D01*
+X111359285Y-128177857D01*
+X111430714Y-128035000D01*
+X111573571Y-127963571D01*
+X111787857Y-127963571D01*
+X111930714Y-128035000D01*
+X112645000Y-128963571D02*
+X112645000Y-127963571D01*
+X112645000Y-127463571D02*
+X112573571Y-127535000D01*
+X112645000Y-127606429D01*
+X112716428Y-127535000D01*
+X112645000Y-127463571D01*
+X112645000Y-127606429D01*
+X113573572Y-128963571D02*
+X113430714Y-128892143D01*
+X113359286Y-128820714D01*
+X113287857Y-128677857D01*
+X113287857Y-128249286D01*
+X113359286Y-128106429D01*
+X113430714Y-128035000D01*
+X113573572Y-127963571D01*
+X113787857Y-127963571D01*
+X113930714Y-128035000D01*
+X114002143Y-128106429D01*
+X114073572Y-128249286D01*
+X114073572Y-128677857D01*
+X114002143Y-128820714D01*
+X113930714Y-128892143D01*
+X113787857Y-128963571D01*
+X113573572Y-128963571D01*
+X114716429Y-127963571D02*
+X114716429Y-128963571D01*
+X114716429Y-128106429D02*
+X114787857Y-128035000D01*
+X114930715Y-127963571D01*
+X115145000Y-127963571D01*
+X115287857Y-128035000D01*
+X115359286Y-128177857D01*
+X115359286Y-128963571D01*
+X117716429Y-128177857D02*
+X117930715Y-128249286D01*
+X118002143Y-128320714D01*
+X118073572Y-128463571D01*
+X118073572Y-128677857D01*
+X118002143Y-128820714D01*
+X117930715Y-128892143D01*
+X117787857Y-128963571D01*
+X117216429Y-128963571D01*
+X117216429Y-127463571D01*
+X117716429Y-127463571D01*
+X117859286Y-127535000D01*
+X117930715Y-127606429D01*
+X118002143Y-127749286D01*
+X118002143Y-127892143D01*
+X117930715Y-128035000D01*
+X117859286Y-128106429D01*
+X117716429Y-128177857D01*
+X117216429Y-128177857D01*
 D12*
 X151130000Y-115570000D02*
 X150495000Y-115570000D01*
@@ -1690,28 +1704,6 @@ X102930000Y-136645000D02*
 X102930000Y-111005000D01*
 X102930000Y-111005000D02*
 X92650000Y-111005000D01*
-X83550000Y-111065000D02*
-G75*
-G02X81550000Y-111065000I-1000000J0D01*
-G01*
-X81550000Y-111065000D02*
-X79900000Y-111065000D01*
-X79900000Y-111065000D02*
-X79900000Y-136585000D01*
-X79900000Y-136585000D02*
-X85200000Y-136585000D01*
-X85200000Y-136585000D02*
-X85200000Y-111065000D01*
-X85200000Y-111065000D02*
-X83550000Y-111065000D01*
-X77410000Y-111005000D02*
-X77410000Y-136645000D01*
-X77410000Y-136645000D02*
-X87690000Y-136645000D01*
-X87690000Y-136645000D02*
-X87690000Y-111005000D01*
-X87690000Y-111005000D02*
-X77410000Y-111005000D01*
 X128000000Y-116145000D02*
 G75*
 G02X126000000Y-116145000I-1000000J0D01*
@@ -1756,6 +1748,28 @@ X153095000Y-136645000D02*
 X153095000Y-116085000D01*
 X153095000Y-116085000D02*
 X142815000Y-116085000D01*
+X83550000Y-111065000D02*
+G75*
+G02X81550000Y-111065000I-1000000J0D01*
+G01*
+X81550000Y-111065000D02*
+X79900000Y-111065000D01*
+X79900000Y-111065000D02*
+X79900000Y-136585000D01*
+X79900000Y-136585000D02*
+X85200000Y-136585000D01*
+X85200000Y-136585000D02*
+X85200000Y-111065000D01*
+X85200000Y-111065000D02*
+X83550000Y-111065000D01*
+X77410000Y-111005000D02*
+X77410000Y-136645000D01*
+X77410000Y-136645000D02*
+X87690000Y-136645000D01*
+X87690000Y-136645000D02*
+X87690000Y-111005000D01*
+X87690000Y-111005000D02*
+X77410000Y-111005000D01*
 D14*
 X135215476Y-138247381D02*
 X135215476Y-137247381D01*
@@ -2068,89 +2082,6 @@ X98242381Y-120944047D01*
 X98242381Y-121182143D01*
 X98194762Y-121277381D01*
 X98147143Y-121325000D01*
-X81788095Y-114387381D02*
-X81788095Y-115196905D01*
-X81835714Y-115292143D01*
-X81883333Y-115339762D01*
-X81978571Y-115387381D01*
-X82169048Y-115387381D01*
-X82264286Y-115339762D01*
-X82311905Y-115292143D01*
-X82359524Y-115196905D01*
-X82359524Y-114387381D01*
-X82788095Y-114482619D02*
-X82835714Y-114435000D01*
-X82930952Y-114387381D01*
-X83169048Y-114387381D01*
-X83264286Y-114435000D01*
-X83311905Y-114482619D01*
-X83359524Y-114577857D01*
-X83359524Y-114673095D01*
-X83311905Y-114815952D01*
-X82740476Y-115387381D01*
-X83359524Y-115387381D01*
-X82002381Y-126944048D02*
-X82002381Y-126277381D01*
-X83002381Y-126705953D01*
-X82335714Y-125467857D02*
-X83002381Y-125467857D01*
-X81954762Y-125705953D02*
-X82669048Y-125944048D01*
-X82669048Y-125325000D01*
-X83002381Y-124467857D02*
-X83002381Y-124944048D01*
-X82002381Y-124944048D01*
-X82954762Y-124182143D02*
-X83002381Y-124039286D01*
-X83002381Y-123801190D01*
-X82954762Y-123705952D01*
-X82907143Y-123658333D01*
-X82811905Y-123610714D01*
-X82716667Y-123610714D01*
-X82621429Y-123658333D01*
-X82573810Y-123705952D01*
-X82526190Y-123801190D01*
-X82478571Y-123991667D01*
-X82430952Y-124086905D01*
-X82383333Y-124134524D01*
-X82288095Y-124182143D01*
-X82192857Y-124182143D01*
-X82097619Y-124134524D01*
-X82050000Y-124086905D01*
-X82002381Y-123991667D01*
-X82002381Y-123753571D01*
-X82050000Y-123610714D01*
-X82002381Y-123277381D02*
-X82002381Y-122658333D01*
-X82383333Y-122991667D01*
-X82383333Y-122848809D01*
-X82430952Y-122753571D01*
-X82478571Y-122705952D01*
-X82573810Y-122658333D01*
-X82811905Y-122658333D01*
-X82907143Y-122705952D01*
-X82954762Y-122753571D01*
-X83002381Y-122848809D01*
-X83002381Y-123134524D01*
-X82954762Y-123229762D01*
-X82907143Y-123277381D01*
-X82002381Y-122325000D02*
-X82002381Y-121658333D01*
-X83002381Y-122086905D01*
-X82002381Y-121372619D02*
-X82002381Y-120753571D01*
-X82383333Y-121086905D01*
-X82383333Y-120944047D01*
-X82430952Y-120848809D01*
-X82478571Y-120801190D01*
-X82573810Y-120753571D01*
-X82811905Y-120753571D01*
-X82907143Y-120801190D01*
-X82954762Y-120848809D01*
-X83002381Y-120944047D01*
-X83002381Y-121229762D01*
-X82954762Y-121325000D01*
-X82907143Y-121372619D01*
 X126238095Y-119467381D02*
 X126238095Y-120276905D01*
 X126285714Y-120372143D01*
@@ -2358,4 +2289,78 @@ X148026429Y-123293571D01*
 X147931190Y-123341190D01*
 X147883571Y-123388809D01*
 X147835952Y-123484047D01*
+X81788095Y-114387381D02*
+X81788095Y-115196905D01*
+X81835714Y-115292143D01*
+X81883333Y-115339762D01*
+X81978571Y-115387381D01*
+X82169048Y-115387381D01*
+X82264286Y-115339762D01*
+X82311905Y-115292143D01*
+X82359524Y-115196905D01*
+X82359524Y-114387381D01*
+X82788095Y-114482619D02*
+X82835714Y-114435000D01*
+X82930952Y-114387381D01*
+X83169048Y-114387381D01*
+X83264286Y-114435000D01*
+X83311905Y-114482619D01*
+X83359524Y-114577857D01*
+X83359524Y-114673095D01*
+X83311905Y-114815952D01*
+X82740476Y-115387381D01*
+X83359524Y-115387381D01*
+X82002381Y-126944048D02*
+X82002381Y-126277381D01*
+X83002381Y-126705953D01*
+X82335714Y-125467857D02*
+X83002381Y-125467857D01*
+X81954762Y-125705953D02*
+X82669048Y-125944048D01*
+X82669048Y-125325000D01*
+X83002381Y-124467857D02*
+X83002381Y-124944048D01*
+X82002381Y-124944048D01*
+X82954762Y-124182143D02*
+X83002381Y-124039286D01*
+X83002381Y-123801190D01*
+X82954762Y-123705952D01*
+X82907143Y-123658333D01*
+X82811905Y-123610714D01*
+X82716667Y-123610714D01*
+X82621429Y-123658333D01*
+X82573810Y-123705952D01*
+X82526190Y-123801190D01*
+X82478571Y-123991667D01*
+X82430952Y-124086905D01*
+X82383333Y-124134524D01*
+X82288095Y-124182143D01*
+X82192857Y-124182143D01*
+X82097619Y-124134524D01*
+X82050000Y-124086905D01*
+X82002381Y-123991667D01*
+X82002381Y-123753571D01*
+X82050000Y-123610714D01*
+X82002381Y-123277381D02*
+X82002381Y-122658333D01*
+X82383333Y-122991667D01*
+X82383333Y-122848809D01*
+X82430952Y-122753571D01*
+X82478571Y-122705952D01*
+X82573810Y-122658333D01*
+X82811905Y-122658333D01*
+X82907143Y-122705952D01*
+X82954762Y-122753571D01*
+X83002381Y-122848809D01*
+X83002381Y-123134524D01*
+X82954762Y-123229762D01*
+X82907143Y-123277381D01*
+X82002381Y-122325000D02*
+X82002381Y-121658333D01*
+X83002381Y-122086905D01*
+X82335714Y-120848809D02*
+X83002381Y-120848809D01*
+X81954762Y-121086905D02*
+X82669048Y-121325000D01*
+X82669048Y-120705952D01*
 M02*
diff --git a/RC6502 Joystick/export/RC6502 Joystick.drl b/RC6502 Joystick/export/RC6502 Joystick.drl
index 0b4badf..4369ff9 100644
--- a/RC6502 Joystick/export/RC6502 Joystick.drl	
+++ b/RC6502 Joystick/export/RC6502 Joystick.drl	
@@ -1,5 +1,5 @@
 M48
-;DRILL file {KiCad 4.0.7} date 02/14/19 14:28:22
+;DRILL file {KiCad 4.0.7} date 03/03/19 23:52:26
 ;FORMAT={2:4/ absolute / inch / suppress leading zeros}
 FMAT,2
 INCH,TZ