diff --git a/keyboards/40percentclub/sixpack/keymaps/via/keymap.c b/keyboards/40percentclub/sixpack/keymaps/via/keymap.c
index f3268a22..e2eaaa1d 100644
--- a/keyboards/40percentclub/sixpack/keymaps/via/keymap.c
+++ b/keyboards/40percentclub/sixpack/keymaps/via/keymap.c
@@ -33,9 +33,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		 KC_TRNS, KC_TRNS, KC_TRNS),
     [3] = LAYOUT_ortho_2x3(KC_TRNS, KC_TRNS, KC_TRNS,
 		 KC_TRNS, KC_TRNS, KC_TRNS),
-    [4] = LAYOUT_ortho_2x3(KC_TRNS, KC_TRNS, KC_TRNS,
-		 KC_TRNS, KC_TRNS, KC_TRNS),
-    [5] = LAYOUT_ortho_2x3(KC_TRNS, KC_TRNS, KC_TRNS,
-		 KC_TRNS, KC_TRNS, KC_TRNS),
 
 };
diff --git a/keyboards/sixkeyboard/keymaps/via/keymap.c b/keyboards/sixkeyboard/keymaps/via/keymap.c
index fed34159..39282b9b 100644
--- a/keyboards/sixkeyboard/keymaps/via/keymap.c
+++ b/keyboards/sixkeyboard/keymaps/via/keymap.c
@@ -17,22 +17,22 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
+  [0] = LAYOUT_ortho_2x3(
     KC_A, KC_B, KC_C,
     KC_D, KC_E, KC_F
   ),
 
-  [1] = LAYOUT(
+  [1] = LAYOUT_ortho_2x3(
     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [2] = LAYOUT(
+  [2] = LAYOUT_ortho_2x3(
     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [3] = LAYOUT(
+  [3] = LAYOUT_ortho_2x3(
     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS
   )