diff --git a/keyboards/bpiphany/sixshooter/config.h b/keyboards/bpiphany/sixshooter/config.h
index ade95cc1918..c3ce8c88454 100644
--- a/keyboards/bpiphany/sixshooter/config.h
+++ b/keyboards/bpiphany/sixshooter/config.h
@@ -11,26 +11,16 @@
 #define DESCRIPTION     A PCB for the CM Storm switch tester utilizing a Teensy 2.0.
 
 /* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 6
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 3
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_ROW_PINS {  }
-#define MATRIX_COL_PINS { F7, F6, F1, F5, F4, F0 }
+/* Keyboard Matrix Assignments */
+#define DIRECT_PINS { \
+    { F7, F6, F1 }, \
+    { F5, F4, F0 } \
+}
 #define UNUSED_PINS
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/bpiphany/sixshooter/sixshooter.h b/keyboards/bpiphany/sixshooter/sixshooter.h
index 490d562d061..e8fc68f5c90 100644
--- a/keyboards/bpiphany/sixshooter/sixshooter.h
+++ b/keyboards/bpiphany/sixshooter/sixshooter.h
@@ -4,10 +4,12 @@
 #include "quantum.h"
 
 #define LAYOUT( \
-	K00, K01, K02, \
-	K03, K04, K05 \
-) { \
-	{ K00, K01, K02, K03, K04, K05 }, \
+    K00, K01, K02, \
+    K03, K04, K05 \
+) \
+{ \
+    { K00, K01, K02 }, \
+    { K03, K04, K05 } \
 }
 
 inline void sixshooter_led_0_on(void)    { DDRB |=  (1<<6); PORTB |=  (1<<6); }