diff --git a/MCUME_teensy/teensy5200/iopins.h b/MCUME_teensy/teensy5200/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensy5200/iopins.h
+++ b/MCUME_teensy/teensy5200/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensy64/iopins.h b/MCUME_teensy/teensy64/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensy64/iopins.h
+++ b/MCUME_teensy/teensy64/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensy800/iopins.h b/MCUME_teensy/teensy800/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensy800/iopins.h
+++ b/MCUME_teensy/teensy800/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensy8086/iopins.h b/MCUME_teensy/teensy8086/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensy8086/iopins.h
+++ b/MCUME_teensy/teensy8086/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensy81/iopins.h b/MCUME_teensy/teensy81/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensy81/iopins.h
+++ b/MCUME_teensy/teensy81/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensycastaway/iopins.h b/MCUME_teensy/teensycastaway/iopins.h
index 28b6b83..72fed3a 100644
--- a/MCUME_teensy/teensycastaway/iopins.h
+++ b/MCUME_teensy/teensycastaway/iopins.h
@@ -35,13 +35,26 @@
 #define I2C_SDA_IO     18
 
 // Analog joystick (primary) for JOY2 and 5 extra buttons
+#ifdef HAS_T4_VGA
+#define PIN_JOY2_A1X    A3
+#define PIN_JOY2_A2Y    A2
+#define PIN_JOY2_BTN    14
+#define PIN_KEY_USER1   22
+#define PIN_KEY_USER2   23
+
+// Second joystick
+#define PIN_JOY1_BTN     34
+#define PIN_JOY1_1       35 // UP
+#define PIN_JOY1_2       36 // DOWN
+#define PIN_JOY1_3       38 // RIGHT
+#define PIN_JOY1_4       37 // LEFT
+
+#else
 #define PIN_JOY2_A1X    A1
 #define PIN_JOY2_A2Y    A2
 #define PIN_JOY2_BTN    17
 #define PIN_KEY_USER1   3 //34
 #define PIN_KEY_USER2   4 //35
-//#define PIN_KEY_USER3   33
-//#define PIN_KEY_USER4   39
 
 // Second joystick
 #define PIN_JOY1_BTN     2
@@ -49,6 +62,7 @@
 #define PIN_JOY1_2       7  // DOWN
 #define PIN_JOY1_3       6  // RIGHT
 #define PIN_JOY1_4       5  // LEFT
+#endif
 
 #else 
 // OLD LAYOUT!!!!
@@ -87,7 +101,3 @@
 #endif
 
 #endif
-
-
-
-
diff --git a/MCUME_teensy/teensycolem/iopins.h b/MCUME_teensy/teensycolem/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensycolem/iopins.h
+++ b/MCUME_teensy/teensycolem/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensygen/iopins.h b/MCUME_teensy/teensygen/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensygen/iopins.h
+++ b/MCUME_teensy/teensygen/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensygnuboy/iopins.h b/MCUME_teensy/teensygnuboy/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensygnuboy/iopins.h
+++ b/MCUME_teensy/teensygnuboy/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensylogo/iopins.h b/MCUME_teensy/teensylogo/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensylogo/iopins.h
+++ b/MCUME_teensy/teensylogo/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensymsx/iopins.h b/MCUME_teensy/teensymsx/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensymsx/iopins.h
+++ b/MCUME_teensy/teensymsx/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensynofrendo/iopins.h b/MCUME_teensy/teensynofrendo/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensynofrendo/iopins.h
+++ b/MCUME_teensy/teensynofrendo/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensyo2em/iopins.h b/MCUME_teensy/teensyo2em/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensyo2em/iopins.h
+++ b/MCUME_teensy/teensyo2em/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensypce/iopins.h b/MCUME_teensy/teensypce/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensypce/iopins.h
+++ b/MCUME_teensy/teensypce/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensysms/iopins.h b/MCUME_teensy/teensysms/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensysms/iopins.h
+++ b/MCUME_teensy/teensysms/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensyspeccy/iopins.h b/MCUME_teensy/teensyspeccy/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensyspeccy/iopins.h
+++ b/MCUME_teensy/teensyspeccy/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensyvcs/iopins.h b/MCUME_teensy/teensyvcs/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensyvcs/iopins.h
+++ b/MCUME_teensy/teensyvcs/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy/teensyvectrex/iopins.h b/MCUME_teensy/teensyvectrex/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy/teensyvectrex/iopins.h
+++ b/MCUME_teensy/teensyvectrex/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy41/pcb_t41/schematic_T4VGA.png b/MCUME_teensy41/pcb_t41/schematic_T4VGA.png
new file mode 100644
index 0000000..32735d8
Binary files /dev/null and b/MCUME_teensy41/pcb_t41/schematic_T4VGA.png differ
diff --git a/MCUME_teensy41/teensycastaway41/iopins.h b/MCUME_teensy41/teensycastaway41/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy41/teensycastaway41/iopins.h
+++ b/MCUME_teensy41/teensycastaway41/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else
diff --git a/MCUME_teensy41/teensyuae41/iopins.h b/MCUME_teensy41/teensyuae41/iopins.h
index fb340f0..72fed3a 100644
--- a/MCUME_teensy41/teensyuae41/iopins.h
+++ b/MCUME_teensy41/teensyuae41/iopins.h
@@ -44,9 +44,9 @@
 
 // Second joystick
 #define PIN_JOY1_BTN     34
-#define PIN_JOY1_1       38 // UP
+#define PIN_JOY1_1       35 // UP
 #define PIN_JOY1_2       36 // DOWN
-#define PIN_JOY1_3       35 // RIGHT
+#define PIN_JOY1_3       38 // RIGHT
 #define PIN_JOY1_4       37 // LEFT
 
 #else