Ergodash refactor (#3196)

* Deleted LAYOUTS = ortho_5x14 from rules.mk

* Refactor

* Configurator support

5 files changed, 110 insertions, 105 deletions

diff --git a/keyboards/ergodash/ergodash.h b/keyboards/ergodash/ergodash.h
index 534486ba81..ebb6b614ec 100644
--- a/keyboards/ergodash/ergodash.h
+++ b/keyboards/ergodash/ergodash.h
@@ -24,6 +24,4 @@
         KC_##LT0, KC_##LT1, KC_##LT2, KC_##LT3,           KC_##LT4, KC_##LT5, KC_##RT0, KC_##RT1,           KC_##RT2, KC_##RT3, KC_##RT4, KC_##RT5  \
     )
 
-#define KC_LAYOUT_ortho_5x14 KC_KEYMAP
-
 #endif
diff --git a/keyboards/ergodash/info.json b/keyboards/ergodash/info.json
new file mode 100644
index 0000000000..dedef86791
--- /dev/null
+++ b/keyboards/ergodash/info.json
@@ -0,0 +1,13 @@
+{
+  "keyboard_name": "ErgoDash",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 16,
+  "height": 6.25,
+  "layouts": {
+    "LAYOUT": {
+      "key_count": 68,
+      "layout": [{"label":"L00", "x":0, "y":0.375}, {"label":"L01", "x":1, "y":0.375}, {"label":"L02", "x":2, "y":0.125}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0.125}, {"label":"L05", "x":5, "y":0.25}, {"label":"L06", "x":6, "y":0.75}, {"label":"R00", "x":9, "y":0.75}, {"label":"R01", "x":10, "y":0.25}, {"label":"R02", "x":11, "y":0.125}, {"label":"R03", "x":12, "y":0}, {"label":"R04", "x":13, "y":0.125}, {"label":"R05", "x":14, "y":0.375}, {"label":"R06", "x":15, "y":0.375}, {"label":"L10", "x":0, "y":1.375}, {"label":"L11", "x":1, "y":1.375}, {"label":"L12", "x":2, "y":1.125}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1.125}, {"label":"L15", "x":5, "y":1.25}, {"label":"L16", "x":6, "y":1.75}, {"label":"R10", "x":9, "y":1.75}, {"label":"R11", "x":10, "y":1.25}, {"label":"R12", "x":11, "y":1.125}, {"label":"R13", "x":12, "y":1}, {"label":"R14", "x":13, "y":1.125}, {"label":"R15", "x":14, "y":1.375}, {"label":"R16", "x":15, "y":1.375}, {"label":"L20", "x":0, "y":2.375}, {"label":"L21", "x":1, "y":2.375}, {"label":"L22", "x":2, "y":2.125}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2.125}, {"label":"L25", "x":5, "y":2.25}, {"label":"L26", "x":6, "y":2.75}, {"label":"R20", "x":9, "y":2.75}, {"label":"R21", "x":10, "y":2.25}, {"label":"R22", "x":11, "y":2.125}, {"label":"R23", "x":12, "y":2}, {"label":"R24", "x":13, "y":2.125}, {"label":"R25", "x":14, "y":2.375}, {"label":"R26", "x":15, "y":2.375}, {"label":"L30", "x":0, "y":3.375}, {"label":"L31", "x":1, "y":3.375}, {"label":"L32", "x":2, "y":3.125}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":4, "y":3.125}, {"label":"L35", "x":5, "y":3.25}, {"label":"L36", "x":6.5, "y":4.25}, {"label":"R30", "x":8.5, "y":4.25}, {"label":"R31", "x":10, "y":3.25}, {"label":"R32", "x":11, "y":3.125}, {"label":"R33", "x":12, "y":3}, {"label":"R34", "x":13, "y":3.125}, {"label":"R35", "x":14, "y":3.375}, {"label":"R36", "x":15, "y":3.375}, {"label":"LT0", "x":0, "y":4.375}, {"label":"LT1", "x":1, "y":4.375}, {"label":"LT2", "x":2, "y":4.125}, {"label":"LT3", "x":3, "y":4}, {"label":"LT4", "x":5.5, "y":5.25}, {"label":"LT5", "x":6.5, "y":5.25}, {"label":"RT0", "x":8.5, "y":5.25}, {"label":"RT1", "x":9.5, "y":5.25}, {"label":"RT2", "x":12, "y":4}, {"label":"RT3", "x":13, "y":4.125}, {"label":"RT4", "x":14, "y":4.375}, {"label":"RT5", "x":15, "y":4.375}]
+    }
+  }
+}
diff --git a/keyboards/ergodash/keymaps/default/keymap.c b/keyboards/ergodash/keymaps/default/keymap.c
index 88f813223c..1464fd20e0 100644
--- a/keyboards/ergodash/keymaps/default/keymap.c
+++ b/keyboards/ergodash/keymaps/default/keymap.c
@@ -17,98 +17,94 @@ enum custom_keycodes {
 };
 
 // Fillers to make layering more clear
-#define KC_ KC_TRNS
 #define _______ KC_TRNS
 #define XXXXXXX KC_NO
-#define KC_AJST ADJUST
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
 #define KC_JPN LALT(KC_GRV)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-/* Qwerty
- * ,-------------------------------------------------------------------------------------------------.
- * | ESC  |   1  |   2  |   3  |   4  |   5  |   [  |   ]  |   6  |   7  |   8  |   9  |   0  | Caps |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |  `   |   Q  |   W  |   E  |   R  |   T  |   -  |   =  |   Y  |   U  |   I  |   O  |   P  |  \   |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |  Del | Bksp |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |  JPN | Enter|   N  |   M  |   ,  |   .  |   /  | Shift|
- * `-------------+------+------+------+------+------+------+------+------+------+------+-------------'
- * | Ctrl |  GUI |  ALt |Adjust|      |Lower | Space |Enter |Raise|      |  Left| Down |  Up  | Right|
- * ,-------------------------------------------------------------------------------------------------.
- */
-[_QWERTY] = LAYOUT( \
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_LBRC,       KC_RBRC, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_CAPS, \
-  KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_MINS,       KC_EQL , KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, \
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_DEL ,       KC_BSPC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_JPN ,       KC_ENT , KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, \
-  KC_LCTL, KC_LGUI, KC_LALT, KC_AJST,          KC_LOWR, KC_SPC ,       KC_ENT , KC_RASE,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
-),
+  /* Qwerty
+   * ,-------------------------------------------------------------------------------------------------.
+   * | ESC  |   1  |   2  |   3  |   4  |   5  |   [  |   ]  |   6  |   7  |   8  |   9  |   0  | Caps |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |  `   |   Q  |   W  |   E  |   R  |   T  |   -  |   =  |   Y  |   U  |   I  |   O  |   P  |  \   |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * | Tab  |   A  |   S  |   D  |   F  |   G  |  Del | Bksp |   H  |   J  |   K  |   L  |   ;  |  "   |
+   * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
+   * | Shift|   Z  |   X  |   C  |   V  |   B  |  JPN | Enter|   N  |   M  |   ,  |   .  |   /  | Shift|
+   * `-------------+------+------+------+------+------+------+------+------+------+------+-------------'
+   * | Ctrl |  GUI |  ALt |Adjust|      |Lower | Space |Enter |Raise|      |  Left| Down |  Up  | Right|
+   * ,-------------------------------------------------------------------------------------------------.
+   */
+  [_QWERTY] = LAYOUT( \
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_LBRC,       KC_RBRC, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_CAPS, \
+    KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_MINS,       KC_EQL , KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, \
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_DEL ,       KC_BSPC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_JPN ,       KC_ENT , KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, \
+    KC_LCTL, KC_LGUI, KC_LALT, ADJUST,           LOWER,   KC_SPC ,       KC_ENT , RAISE,            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+  ),
 
-/* Lower
-* ,-------------------------------------------------------------------------------------------------.
-* | F11  |  F1  |  F2  |  F3  |  F4  |  F5  |   {  |   }  |  F6  |  F7  |  F8  |  F9  |  F10 | F12  |
-* |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-* |  ~  |   !  |   @  |   #  |   $  |   %  |   _  |   +  |   ^  |   &  |   *  |   (  |    )  |  |   |
-* |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-* | Tab  |   A  |   S  |   D  |   F  |   G  |  Del | Bksp |   H  |   J  |   K  |   L  |   :  |  "   |
-* |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
-* | Shift|   Z  |   X  |   C  |   V  |   B  |  JPN | Enter|   N  |   M  |   <  |   >  |   ?  | Shift|
-* `-------------+------+------+------+------+------+------+------+------+------+------+-------------'
-* | Ctrl |  GUI |  ALt |Adjust|      |Lower | Space |Enter |Raise|      | Home |PageDn|PageUp|  End |
-* ,-------------------------------------------------------------------------------------------------.
- */
- [_LOWER] = LAYOUT(
-  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_LCBR,       KC_RCBR, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,  \
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_UNDS,       KC_PLUS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \
-  KC_TAB,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_DEL ,       KC_BSPC, KC_H,    KC_J,    KC_K,    KC_L,    KC_COLN, KC_DQT , \
-  KC_LSFT, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_JPN ,       KC_ENT , KC_N,    KC_M,    KC_LT,   KC_GT,   KC_QUES, KC_RSFT, \
-  KC_LCTL, KC_LGUI, KC_LALT, KC_AJST,          KC_LOWR, KC_SPC ,       KC_ENT , KC_RASE,          KC_HOME, KC_PGDN, KC_PGUP, KC_END   \
- ),
+  /* Lower
+   * ,-------------------------------------------------------------------------------------------------.
+   * | F11  |  F1  |  F2  |  F3  |  F4  |  F5  |   {  |   }  |  F6  |  F7  |  F8  |  F9  |  F10 | F12  |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |  ~   |   !  |   @  |   #  |   $  |   %  |   _  |   +  |   ^  |   &  |   *  |   (  |   )  |  |   |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * | Tab  |   1  |   2  |   3  |   4  |   5  |  Del | Bksp |   H  |   J  |   K  |   L  |   :  |  "   |
+   * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
+   * | Shift|   6  |   7  |   8  |   9  |   0  |  JPN | Enter|   N  |   M  |   <  |   >  |   ?  | Shift|
+   * `-------------+------+------+------+------+------+------+------+------+------+------+-------------'
+   * | Ctrl |  GUI |  ALt |Adjust|      |Lower | Space |Enter |Raise|      | Home |PageDn|PageUp|  End |
+   * ,-------------------------------------------------------------------------------------------------.
+   */
+  [_LOWER] = LAYOUT(
+    KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_LCBR,       KC_RCBR, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,  \
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_UNDS,       KC_PLUS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \
+    KC_TAB,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_DEL ,       KC_BSPC, KC_H,    KC_J,    KC_K,    KC_L,    KC_COLN, KC_DQT , \
+    KC_LSFT, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_JPN ,       KC_ENT , KC_N,    KC_M,    KC_LT,   KC_GT,   KC_QUES, KC_RSFT, \
+    KC_LCTL, KC_LGUI, KC_LALT, ADJUST,           LOWER,   KC_SPC ,       KC_ENT , RAISE,            KC_HOME, KC_PGDN, KC_PGUP, KC_END   \
+  ),
 
-/* Raise
-* ,-------------------------------------------------------------------------------------------------.
-* | F11  |  F1  |  F2  |  F3  |  F4  |  F5  |   {  |   }  |  F6  |  F7  |  F8  |  F9  |  F10 | F12  |
-* |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-* |  ~  |   !  |   @  |   #  |   $  |   %  |   _  |   +  |   ^  |   &  |   *  |   (  |    )  |  |   |
-* |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-* | Tab  |   A  |   S  |   D  |   F  |   G  |  Del | Bksp |   H  |   J  |   K  |   L  |   :  |  "   |
-* |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
-* | Shift|   Z  |   X  |   C  |   V  |   B  |  JPN | Enter|   N  |   M  |   <  |   >  |   ?  | Shift|
-* `-------------+------+------+------+------+------+------+------+------+------+------+-------------'
-* | Ctrl |  GUI |  ALt |Adjust|      |Lower | Space |Enter |Raise|      | Home |PageDn|PageUp|  End |
-* ,-------------------------------------------------------------------------------------------------.
- */
+  /* Raise
+   * ,-------------------------------------------------------------------------------------------------.
+   * | F11  |  F1  |  F2  |  F3  |  F4  |  F5  |   {  |   }  |  F6  |  F7  |  F8  |  F9  |  F10 | F12  |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |  ~   |   !  |   @  |   #  |   $  |   %  |   _  |   +  |   ^  |   &  |   *  |   (  |   )  |  |   |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * | Tab  |   1  |   2  |   3  |   4  |   5  |  Del | Bksp |   H  |   J  |   K  |   L  |   :  |  "   |
+   * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
+   * | Shift|   6  |   7  |   8  |   9  |   0  |  JPN | Enter|   N  |   M  |   <  |   >  |   ?  | Shift|
+   * `-------------+------+------+------+------+------+------+------+------+------+------+-------------'
+   * | Ctrl |  GUI |  ALt |Adjust|      |Lower | Space |Enter |Raise|      | Home |PageDn|PageUp|  End |
+   * ,-------------------------------------------------------------------------------------------------.
+   */
   [_RAISE] = LAYOUT(
-  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_LCBR,       KC_RCBR, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,  \
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_UNDS,       KC_PLUS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \
-  KC_TAB,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_DEL ,       KC_BSPC, KC_H,    KC_J,    KC_K,    KC_L,    KC_COLN, KC_DQT , \
-  KC_LSFT, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_JPN ,       KC_ENT , KC_N,    KC_M,    KC_LT,   KC_GT,   KC_QUES, KC_RSFT, \
-  KC_LCTL, KC_LGUI, KC_LALT, KC_AJST,          KC_LOWR, KC_SPC ,       KC_ENT , KC_RASE,          KC_HOME, KC_PGDN, KC_PGUP, KC_END   \
- ),
+    KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_LCBR,       KC_RCBR, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,  \
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_UNDS,       KC_PLUS, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \
+    KC_TAB,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_DEL ,       KC_BSPC, KC_H,    KC_J,    KC_K,    KC_L,    KC_COLN, KC_DQT , \
+    KC_LSFT, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_JPN ,       KC_ENT , KC_N,    KC_M,    KC_LT,   KC_GT,   KC_QUES, KC_RSFT, \
+    KC_LCTL, KC_LGUI, KC_LALT, ADJUST,           LOWER,   KC_SPC ,       KC_ENT , RAISE,            KC_HOME, KC_PGDN, KC_PGUP, KC_END   \
+  ),
 
- /* Adjust
- * ,-------------------------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | Reset|RGB ON|  MODE|  HUE-|  HUE+|      |      |  SAT-|  SAT+|  VAL-|  VAL+|      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-------------+------+------+------+------+------+------+------+------+------+------+-------------'
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * ,-------------------------------------------------------------------------------------------------.
-  */
+  /* Adjust
+   * ,-------------------------------------------------------------------------------------------------.
+   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |      | Reset|RGB ON|  MODE|  HUE-|  HUE+|      |      |  SAT-|  SAT+|  VAL-|  VAL+|      |      |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+   * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
+   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+   * `-------------+------+------+------+------+------+------+------+------+------+------+-------------'
+   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+   * ,-------------------------------------------------------------------------------------------------.
+   */
   [_ADJUST] = LAYOUT(
-  _______, _______, _______, _______, _______, _______,_______,       _______, _______, _______, _______, _______, _______, _______, \
-  _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,_______,       _______, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \
-  _______, _______, _______, _______, _______, _______,_______,       _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______, _______, _______,_______,       _______, _______, _______, _______, _______, _______, _______, \
-  _______, _______, _______, _______,          _______,_______,       _______, _______,          _______, _______, _______, _______ \
+    _______, _______, _______, _______, _______, _______,_______,       _______, _______, _______, _______, _______, _______, _______, \
+    _______, RESET  , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,_______,       _______, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \
+    _______, _______, _______, _______, _______, _______,_______,       _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______,_______,       _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______,          _______,_______,       _______, _______,          _______, _______, _______, _______ \
   )
 };
 
diff --git a/keyboards/ergodash/rev1/rev1.h b/keyboards/ergodash/rev1/rev1.h
index d27d22dca1..952801916a 100644
--- a/keyboards/ergodash/rev1/rev1.h
+++ b/keyboards/ergodash/rev1/rev1.h
@@ -28,16 +28,16 @@
 	LT0, LT1, LT2, LT3,      LT4, LT5, RT0, RT1,      RT2, RT3, RT4, RT5  \
 	) \
 	{ \
-		{ L00, L01, L02, L03, L04, L05, L06 }, \
-		{ L10, L11, L12, L13, L14, L15, L16 }, \
-		{ L20, L21, L22, L23, L24, L25, L26 }, \
-		{ L30, L31, L32, L33, L34, L35, L36 }, \
-		{ LT0, LT1, LT2, LT3, LT4, LT5, KC_NO}, \
-		{ R06, R05, R04, R03, R02, R01, R00 }, \
-		{ R16, R15, R14, R13, R12, R11, R10 }, \
-		{ R26, R25, R24, R23, R22, R21, R20 }, \
-		{ R36, R35, R34, R33, R32, R31, R30 }, \
-		{ RT5, RT4, RT3, RT2, RT1, RT0, KC_NO} \
+		{ L00, L01, L02, L03, L04, L05, L06   }, \
+		{ L10, L11, L12, L13, L14, L15, L16   }, \
+		{ L20, L21, L22, L23, L24, L25, L26   }, \
+		{ L30, L31, L32, L33, L34, L35, L36   }, \
+		{ LT0, LT1, LT2, LT3, LT4, LT5, KC_NO }, \
+		{ R06, R05, R04, R03, R02, R01, R00   }, \
+		{ R16, R15, R14, R13, R12, R11, R10   }, \
+		{ R26, R25, R24, R23, R22, R21, R20   }, \
+		{ R36, R35, R34, R33, R32, R31, R30   }, \
+		{ RT5, RT4, RT3, RT2, RT1, RT0, KC_NO } \
 	}
 #else
 // Keymap with right side flipped
@@ -50,16 +50,16 @@
 	LT0, LT1, LT2, LT3,      LT4, LT5, RT0, RT1,      RT2, RT3, RT4, RT5  \
 	) \
 	{ \
-		{ L00, L01, L02, L03, L04, L05, L06 }, \
-		{ L10, L11, L12, L13, L14, L15, L16 }, \
-		{ L20, L21, L22, L23, L24, L25, L26 }, \
-		{ L30, L31, L32, L33, L34, L35, L36 }, \
-		{ LT0, LT1, LT2, LT3, LT4, LT, KC_NO}, \
-		{ R00, R01, R02, R03, R04, R05, R06 }, \
-		{ R10, R11, R12, R13, R14, R15, R16 }, \
-		{ R20, R21, R22, R23, R24, R25, R26 }, \
-		{ R30, R31, R32, R33, R34, R35, R36 }, \
-		{ RT0, RT1, RT2, RT3, RT4, RT5, KC_NO} \
+		{ L00, L01, L02, L03, L04, L05, L06   }, \
+		{ L10, L11, L12, L13, L14, L15, L16   }, \
+		{ L20, L21, L22, L23, L24, L25, L26   }, \
+		{ L30, L31, L32, L33, L34, L35, L36   }, \
+		{ LT0, LT1, LT2, LT3, LT4, LT5, KC_NO }, \
+		{ R00, R01, R02, R03, R04, R05, R06   }, \
+		{ R10, R11, R12, R13, R14, R15, R16   }, \
+		{ R20, R21, R22, R23, R24, R25, R26   }, \
+		{ R30, R31, R32, R33, R34, R35, R36   }, \
+		{ RT0, RT1, RT2, RT3, RT4, RT5, KC_NO } \
 	}
 #endif
 
diff --git a/keyboards/ergodash/rules.mk b/keyboards/ergodash/rules.mk
index 471f6b9cfe..d81fa98a9e 100644
--- a/keyboards/ergodash/rules.mk
+++ b/keyboards/ergodash/rules.mk
@@ -72,6 +72,4 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 CUSTOM_MATRIX = yes
 
-LAYOUTS = ortho_5x14
-
 DEFAULT_FOLDER = ergodash/rev1