Configurator layout repair for Ergodone, Ergodox Infinity and ErgoTravel (#3173)

* Ergodone refactor

* Ergodox Infinity refactor

* Ergotravel refactor

* Ergotravel configurator layout update

* Fixing include on Ergodox Infinity narze keymap

9 files changed, 143 insertions, 150 deletions

diff --git a/keyboards/ergodone/ergodone.h b/keyboards/ergodone/ergodone.h
index b04826e69c..8b51f95b7e 100644
--- a/keyboards/ergodone/ergodone.h
+++ b/keyboards/ergodone/ergodone.h
@@ -67,9 +67,12 @@ inline void ergodox_right_led_3_set(uint8_t n)          {}
 inline void ergodox_right_led_set(uint8_t l, uint8_t n) {}
 inline void ergodox_led_all_set(uint8_t n)              {}
 
-#define KEYMAP(                                                 \
+/*
+ *   LEFT HAND: LINES 76-83
+ *  RIGHT HAND: LINES 85-92
+ */
+#define LAYOUT_ergodox(                                         \
                                                                 \
-    /* left hand, spatial positions */                          \
     k00,k01,k02,k03,k04,k05,k06,                                \
     k10,k11,k12,k13,k14,k15,k16,                                \
     k20,k21,k22,k23,k24,k25,                                    \
@@ -79,7 +82,6 @@ inline void ergodox_led_all_set(uint8_t n)              {}
                                 k54,                            \
                         k53,k52,k51,                            \
                                                                 \
-    /* right hand, spatial positions */                         \
         k07,k08,k09,k0A,k0B,k0C,k0D,                            \
         k17,k18,k19,k1A,k1B,k1C,k1D,                            \
             k28,k29,k2A,k2B,k2C,k2D,                            \
@@ -96,12 +98,15 @@ inline void ergodox_led_all_set(uint8_t n)              {}
     { k20,   k21, k22, k23, k24, k25,   KC_NO,    KC_NO, k28,   k29, k2A, k2B, k2C, k2D    }, \
     { k30,   k31, k32, k33, k34, k35,   k36,      k37,   k38,   k39, k3A, k3B, k3C, k3D    }, \
     { k40,   k41, k42, k43, k44, KC_NO, KC_NO,    KC_NO, KC_NO, k49, k4A, k4B, k4C, k4D    }, \
-    { KC_NO, k51, k52, k53, k54, k55,   k56,      k57,   k58,   k59, k5A, k5B, k5C, KC_NO  } \
+    { KC_NO, k51, k52, k53, k54, k55,   k56,      k57,   k58,   k59, k5A, k5B, k5C, KC_NO  }  \
    }
 
-#define LAYOUT_ergodox_80(                                                 \
+/*
+ *   LEFT HAND: LINES 110-117
+ *  RIGHT HAND: LINES 119-126
+ */
+#define LAYOUT_ergodox_80(                                      \
                                                                 \
-    /* left hand, spatial positions */                          \
     k00,k01,k02,k03,k04,k05,k06,                                \
     k10,k11,k12,k13,k14,k15,k16,                                \
     k20,k21,k22,k23,k24,k25,                                    \
@@ -111,7 +116,6 @@ inline void ergodox_led_all_set(uint8_t n)              {}
                         k45,k46,k54,                            \
                         k53,k52,k51,                            \
                                                                 \
-    /* right hand, spatial positions */                         \
         k07,k08,k09,k0A,k0B,k0C,k0D,                            \
         k17,k18,k19,k1A,k1B,k1C,k1D,                            \
             k28,k29,k2A,k2B,k2C,k2D,                            \
@@ -128,21 +132,22 @@ inline void ergodox_led_all_set(uint8_t n)              {}
     { k20,   k21, k22, k23, k24, k25, KC_NO,    KC_NO, k28, k29, k2A, k2B, k2C, k2D    }, \
     { k30,   k31, k32, k33, k34, k35, k36,      k37,   k38, k39, k3A, k3B, k3C, k3D    }, \
     { k40,   k41, k42, k43, k44, k45, k45,      k47,   k48, k49, k4A, k4B, k4C, k4D    }, \
-    { KC_NO, k51, k52, k53, k54, k55, k56,      k57,   k58, k59, k5A, k5B, k5C, KC_NO  } \
+    { KC_NO, k51, k52, k53, k54, k55, k56,      k57,   k58, k59, k5A, k5B, k5C, KC_NO  }  \
    }
 
-#define KEYMAP_PRETTY(                                                                                        \
-    /* left hand, spatial positions */     /* right hand, spatial positions */                         \
-    L00,L01,L02,L03,L04,L05,L06,               R00,R01,R02,R03,R04,R05,R06,                            \
-    L10,L11,L12,L13,L14,L15,L16,               R10,R11,R12,R13,R14,R15,R16,                            \
-    L20,L21,L22,L23,L24,L25,                       R21,R22,R23,R24,R25,R26,                            \
-    L30,L31,L32,L33,L34,L35,L36,               R30,R31,R32,R33,R34,R35,R36,                            \
-    L40,L41,L42,L43,L44,                               R42,R43,R44,R45,R46,                            \
-                            L55,L56,       R50,R51,                                                    \
-                                L54,       R52,                                                        \
-                        L53,L52,L51,       R55,R54,R53 )                                               \
-                                          \
-   /* matrix positions */                 \
+/*  ---------- LEFT HAND -----------       ---------- RIGHT HAND ---------- */
+#define LAYOUT_ergodox_pretty(                                                  \
+                                                                                \
+    L00,L01,L02,L03,L04,L05,L06,               R00,R01,R02,R03,R04,R05,R06,     \
+    L10,L11,L12,L13,L14,L15,L16,               R10,R11,R12,R13,R14,R15,R16,     \
+    L20,L21,L22,L23,L24,L25,                       R21,R22,R23,R24,R25,R26,     \
+    L30,L31,L32,L33,L34,L35,L36,               R30,R31,R32,R33,R34,R35,R36,     \
+    L40,L41,L42,L43,L44,                               R42,R43,R44,R45,R46,     \
+                            L55,L56,       R50,R51,                             \
+                                L54,       R52,                                 \
+                        L53,L52,L51,       R55,R54,R53 )                        \
+                                                                                \
+   /* matrix positions */                                                       \
    {                                                                            \
     {   L00,L01,L02,L03,L04,L05,L06,            R00,R01,R02,R03,R04,R05,R06  }, \
     {   L10,L11,L12,L13,L14,L15,L16,            R10,R11,R12,R13,R14,R15,R16  }, \
@@ -152,19 +157,20 @@ inline void ergodox_led_all_set(uint8_t n)              {}
     { KC_NO,L51,L52,L53,L54,L55,L56,          R50,R51,R52,R53,R54,R55,KC_NO  }  \
    }
 
-#define LAYOUT_ergodox_pretty_80(                                                                                        \
-    /* left hand, spatial positions */     /* right hand, spatial positions */                         \
-    L00,L01,L02,L03,L04,L05,L06,               R00,R01,R02,R03,R04,R05,R06,                            \
-    L10,L11,L12,L13,L14,L15,L16,               R10,R11,R12,R13,R14,R15,R16,                            \
-    L20,L21,L22,L23,L24,L25,                       R21,R22,R23,R24,R25,R26,                            \
-    L30,L31,L32,L33,L34,L35,L36,               R30,R31,R32,R33,R34,R35,R36,                            \
-    L40,L41,L42,L43,L44,                               R42,R43,R44,R45,R46,                            \
-                            L55,L56,       R50,R51,                                                    \
-                        L45,L46,L54,       R52,R40,R41,                                                \
-                        L53,L52,L51,       R55,R54,R53 )                                               \
-                                          \
-   /* matrix positions */                 \
-   {                                                                            \
+/*  ---------- LEFT HAND -----------       ---------- RIGHT HAND ---------- */
+#define LAYOUT_ergodox_pretty_80(                                              \
+                                                                               \
+    L00,L01,L02,L03,L04,L05,L06,               R00,R01,R02,R03,R04,R05,R06,    \
+    L10,L11,L12,L13,L14,L15,L16,               R10,R11,R12,R13,R14,R15,R16,    \
+    L20,L21,L22,L23,L24,L25,                       R21,R22,R23,R24,R25,R26,    \
+    L30,L31,L32,L33,L34,L35,L36,               R30,R31,R32,R33,R34,R35,R36,    \
+    L40,L41,L42,L43,L44,                               R42,R43,R44,R45,R46,    \
+                            L55,L56,       R50,R51,                            \
+                        L45,L46,L54,       R52,R40,R41,                        \
+                        L53,L52,L51,       R55,R54,R53 )                       \
+                                                                               \
+   /* matrix positions */                                                      \
+   {                                                                           \
     {   L00,L01,L02,L03,L04,L05,L06,          R00,R01,R02,R03,R04,R05,R06   }, \
     {   L10,L11,L12,L13,L14,L15,L16,          R10,R11,R12,R13,R14,R15,R16   }, \
     {   L20,L21,L22,L23,L24,L25,KC_NO,      KC_NO,R21,R22,R23,R24,R25,R26   }, \
@@ -173,7 +179,4 @@ inline void ergodox_led_all_set(uint8_t n)              {}
     { KC_NO,L51,L52,L53,L54,L55,L56,          R50,R51,R52,R53,R54,R55,KC_NO }  \
    }
 
-#define LAYOUT_ergodox KEYMAP
-#define LAYOUT_ergodox_pretty KEYMAP_PRETTY
-
 #endif
diff --git a/keyboards/ergodox_infinity/ergodox_infinity.h b/keyboards/ergodox_infinity/ergodox_infinity.h
index d551fde511..79f01b1849 100644
--- a/keyboards/ergodox_infinity/ergodox_infinity.h
+++ b/keyboards/ergodox_infinity/ergodox_infinity.h
@@ -80,7 +80,11 @@ inline void ergodox_led_all_set(uint8_t n) {
     ergodox_right_led_3_set(n);
 }
 
-#define KEYMAP( \
+/*
+ *   LEFT HAND: LINES 88-95
+ *  RIGHT HAND: LINES 97-104
+ */
+#define LAYOUT_ergodox( \
     A80, A70, A60, A50, A40, A30, A20,  \
     A81, A71, A61, A51, A41, A31, A21,  \
     A82, A72, A62, A52, A42, A32,       \
@@ -89,6 +93,7 @@ inline void ergodox_led_all_set(uint8_t n) {
                                   A13, A03, \
                                        A04, \
                              A34, A24, A14, \
+                                            \
          B20, B30, B40, B50, B60, B70, B80, \
          B21, B31, B41, B51, B61, B71, B81, \
               B32, B42, B52, B62, B72, B82, \
@@ -118,8 +123,9 @@ inline void ergodox_led_all_set(uint8_t n) {
     { B80,   B81,   B82,   B83,   B84 }  \
 }
 
-#define KEYMAP_PRETTY(                                                                      \
-    /* left hand, spatial positions */     /* right hand, spatial positions */              \
+/*  -------------- LEFT HAND --------------     -------------- RIGHT HAND -------------- */
+#define LAYOUT_ergodox_pretty(                                                              \
+                                                                                            \
     A80, A70, A60, A50, A40, A30, A20,               B20, B30, B40, B50, B60, B70, B80,     \
     A81, A71, A61, A51, A41, A31, A21,               B21, B31, B41, B51, B61, B71, B81,     \
     A82, A72, A62, A52, A42, A32,                         B32, B42, B52, B62, B72, B82,     \
@@ -151,7 +157,4 @@ inline void ergodox_led_all_set(uint8_t n) {
     { B80,   B81,   B82,   B83,   B84 }  \
 }
 
-#define LAYOUT_ergodox KEYMAP
-#define LAYOUT_ergodox_pretty KEYMAP_PRETTY
-
 #endif /* KEYBOARDS_ERGODOX_INFINITY_INFINITY_H_ */
diff --git a/keyboards/ergodox_infinity/keymaps/gordon/keymap.c b/keyboards/ergodox_infinity/keymaps/gordon/keymap.c
index 73dd3b325e..f67dd13a5b 100644
--- a/keyboards/ergodox_infinity/keymaps/gordon/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/gordon/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 //**************************FIRST LAYER - LAYER ZERO **************************************
-  [_QWERTY] = KEYMAP(
+  [_QWERTY] = LAYOUT_ergodox(
 
     SHF6_AF7, F1_F13  ,    F2_F14,   TD(F3D), F4_ALTF4,    F5_F15,   KC_F11,
     SPRK_TCK  , Q_ESC   ,  CTR_SH_W,     NAV_E, ALT_SH_R,      KC_T, PRINTSCR,
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
   //**************************SYMBOLS LAYER**************************
-  [_SYMBOLS] = KEYMAP(
+  [_SYMBOLS] = LAYOUT_ergodox(
     ________, ________, ________, ________, ________, ________,  ________,
     ________, DEREF   ,    KC_AT,  KC_LCBR,  KC_RCBR,  KC_CIRC,  ________,
     ________,  KC_EXLM,  KC_HASH,  KC_LPRN,  KC_RPRN,  ________,
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                      ________,________,_XXXXXX_),
 
   //**************************MOUSE MOVEMENT LAYER**************************
-  [_MOUSE] = KEYMAP(UP_ENTER_RESET,________,________,________,________,________,MODRESET,
+  [_MOUSE] = LAYOUT_ergodox(UP_ENTER_RESET,________,________,________,________,________,MODRESET,
                     RESET,KC_SECRET_5,________,KC_MS_UP,KC_SECRET_4,KC_MS_WH_UP,________,
                     ________,________,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_MS_WH_DOWN,
                     KC_SECRET_5,KC_SECRET_4,KC_SECRET_3,_XXXXXX_,KC_SECRET_2,KC_SECRET_1,_XXXXXX_,
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   //**************************WINDOWS NAVIGATION LAYER**************************
 
-  [_NAV] = KEYMAP(________,________,________,________,________,________,________,
+  [_NAV] = LAYOUT_ergodox(________,________,________,________,________,________,________,
                   ________,________,SNAPLEFT,_XXXXXX_,SNAPRGHT,________,________,
                   ________,KC_WWW_BACK,PREVTAB,________,NEXTTAB,SNAPUP,
                   ________,________,WORKLEFT,________,WORKRIGHT,SNAPDOWN,________,
@@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ________,________,________),
 
   //****************************NUMPAD LAYER****************************
-  [_NUMPAD] = KEYMAP(________,________,________,________,________,________,________,
+  [_NUMPAD] = LAYOUT_ergodox(________,________,________,________,________,________,________,
                      ________,________,________,________,________,________,________,
                      ________,KC_DOT  ,KC_SPACE,_XXXXXX_, KC_ESC ,________,
                      ________,DBMS_OUT,________,________,________,________,________,
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                        ________,________,KC_0),
 
   //****************************APP SWITCH LAYER****************************
-  [_APPSWITCH] = KEYMAP(________,________,________,________,________,________,________,
+  [_APPSWITCH] = LAYOUT_ergodox(________,________,________,________,________,________,________,
                         ________,________   ,  ________ , ________  ,________   ,________,________,
                         ________,APP_5,APP_6,APP_7,APP_8,________,
                         ________,DBMS_OUT,________,________,________,________,________,
@@ -176,7 +176,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                     ________,________,________),
 
 
-  [_ONESHOT] = KEYMAP(  UP_ENTER_RESET , ________, ________, ________, ________, ________, ________,
+  [_ONESHOT] = LAYOUT_ergodox(  UP_ENTER_RESET , ________, ________, ________, ________, ________, ________,
                         ________, ________, ________, KC_UP   , ________, ________, ________,
                         ________, ________, KC_LEFT , KC_DOWN , KC_RIGHT, ________,
                         MAGIC_TOGGLE_NKRO, ________, ________, ________, ________, ________, ________,
@@ -196,7 +196,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         ________,
                         ________, ________, ________),
   //****************************TEXT/INTELLIJ NAVIGATION LAYER****************************
-  [_TEXTNAV] = KEYMAP(________,________,________,________,________,________,________,
+  [_TEXTNAV] = LAYOUT_ergodox(________,________,________,________,________,________,________,
                       ________,MEH(KC_Q),LSFT(KC_ESCAPE),MEH(KC_D),MEH(KC_2),LALT(LSFT(KC_UP)),________,
                       ________,________,LCTL(KC_LEFT),LCTL(KC_B),LCTL(KC_RIGHT),LALT(LSFT(KC_DOWN)),
                       ________,________,________,LCTL(LSFT(KC_COMMA)),MEH(KC_DOT),LALT(KC_MS_WH_UP),________,
@@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                       ________,LALT(KC_Z),________,________,________,LCTL(LSFT(KC_LEFT)),LALT(LCTL(KC_S)),LCTL(LSFT(KC_RIGHT)),
                       LCTL(LSFT(KC_COMMA)),________,________,________,________,________,________,________,________,________,
                       ________,________,________,________,________,________,________,________,________,_XXXXXX_),
-  [_QWERTY_KIDS] = KEYMAP(
+  [_QWERTY_KIDS] = LAYOUT_ergodox(
 
       KC_NO ,   KC_NO  , KC_NO ,     KC_NO ,   KC_NO ,      KC_NO ,     KC_NO ,
       KC_NO ,   KC_Q   , KC_W,     KC_E, KC_R,      KC_T,   KC_NO ,
@@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          KC_NO,
   KC_NO, KC_ENTER, KC_SPACE),
 
-  [_STREET_FIGHTER] = KEYMAP(
+  [_STREET_FIGHTER] = LAYOUT_ergodox(
 
       KC_NO ,   KC_NO  , KC_NO ,     KC_NO ,   KC_NO ,      KC_NO ,     KC_NO ,
       KC_NO ,   KC_NO   , DIE_1000X_LEFT,     KC_UP, DIE_1000X_RIGHT,      KC_NO,   KC_NO ,
@@ -254,7 +254,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
   //************************Windows navigation to directories*************************
-  [_DIRNAV] = KEYMAP(
+  [_DIRNAV] = LAYOUT_ergodox(
          ________,________,________,________,________,________,________,
          ________,________,________,________,________,________,________,
          ________,________,KC_A,________,________,________,
@@ -278,7 +278,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          ________,________,________),
 
 
-  [_TEXT_MACROS] = KEYMAP(
+  [_TEXT_MACROS] = LAYOUT_ergodox(
          ________,________,________,________,________,________,________,
          ________,________,________,________,________,________,________,
          ________,________,KC_A,________,________,________,
@@ -305,7 +305,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* FOR FORMATTING FUTURE LAYERS
    NO KEY CODES SHOULD BE MORE THAN 8 CHARACTERS
    GOES LEFT HAND THEN RIGHT HAND
-  [_DIRNAV] = KEYMAP(
+  [_DIRNAV] = LAYOUT_ergodox(
          ________,________,________,________,________,________,________,
          ________,________,________,________,________,________,________,
          ________,________,________,________,________,________,
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c
index b1cfdf42fc..8b6a0fcc70 100644
--- a/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c
@@ -304,7 +304,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 
-[PLVR] = KEYMAP(  // layout: layer 7: Steno for Plover
+[PLVR] = LAYOUT_ergodox(  // layout: layer 7: Steno for Plover
         // left hand
         KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
         KC_NO,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_TRNS,
diff --git a/keyboards/ergodox_infinity/keymaps/narze/keymap.c b/keyboards/ergodox_infinity/keymaps/narze/keymap.c
index 5871c221a2..3fd3b69714 100644
--- a/keyboards/ergodox_infinity/keymaps/narze/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/narze/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox.h"
+#include QMK_KEYBOARD_H
 // #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      | Space| End  |       | PgDn | Space  |      |
  *                                 `--------------------'       `----------------------'
  */
-[_QWERTY] = KEYMAP(
+[_QWERTY] = LAYOUT_ergodox(
         // left hand
         KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LT(_MDIA, KC_NO),
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   LT(_SYMB, KC_NO),
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      | Space| End  |       | PgDn | Space  |      |
  *                                 `--------------------'       `----------------------'
  */
-[_COLEMAK] = KEYMAP(
+[_COLEMAK] = LAYOUT_ergodox(
         // left hand
         KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LT(_MDIA, KC_NO),
         KC_TAB,         KC_Q,         KC_W,   KC_F,   KC_P,   KC_G,   LT(_SYMB, KC_NO),
@@ -177,7 +177,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_PGDN,KC_BSPC, KC_ENT
     ),
 /* Qwerty on software Colemak : Useful for gaming with qwerty keymaps! */
-[_QWOC] = KEYMAP(
+[_QWOC] = LAYOUT_ergodox(
         // left hand
         KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LT(_MDIA, KC_NO),
         KC_TAB,         CM_Q,         CM_W,   CM_E,   CM_R,   CM_T,   LT(_SYMB, KC_NO),
@@ -218,7 +218,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[_LOWER] = KEYMAP(
+[_LOWER] = LAYOUT_ergodox(
        _______, _______, _______, _______, _______, _______, _______,
        _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,
        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
@@ -258,7 +258,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |      |      |
  *                                 `--------------------'       `--------------------'
  */
-[_RAISE] = KEYMAP(
+[_RAISE] = LAYOUT_ergodox(
        _______, _______, _______, _______, _______, _______, _______,
        _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,
        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
@@ -299,7 +299,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      | Space| End  |       | PgDn | Space  |      |
  *                                 `--------------------'       `----------------------'
  */
-[_PLOVER] = KEYMAP(
+[_PLOVER] = LAYOUT_ergodox(
         // left hand
         KC_1,           KC_1,         KC_1,   KC_1,   KC_1,   KC_1,   XXXXXXX,
         XXXXXXX,        KC_1,         KC_1,   KC_1,   KC_1,   KC_1,   XXXXXXX,
@@ -341,7 +341,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[_SUPERDUPER] = KEYMAP(
+[_SUPERDUPER] = LAYOUT_ergodox(
         // left hand
         _______, _______,  _______,   _______,   _______,   _______,   _______,
         _______, _______,  _______,   _______,   _______,   _______,   _______,
@@ -362,7 +362,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              _______,_______, KC_LSFT
     ),
 // Intermediate keymaps for SuperDuper (Combo keys does not work on Infinity yet)
-[_SUPER] = KEYMAP(
+[_SUPER] = LAYOUT_ergodox(
         // left hand
         _______, _______,  _______,   _______,   _______,   _______,   _______,
         _______, _______,  _______,   _______,   _______,   _______,   _______,
@@ -382,7 +382,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              _______,
              _______,_______, _______
     ),
-[_DUPER] = KEYMAP(
+[_DUPER] = LAYOUT_ergodox(
         // left hand
         _______, _______,  _______,   _______,   _______,   _______,   _______,
         _______, _______,  _______,   _______,   _______,   _______,   _______,
@@ -424,7 +424,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 | Click|      |      |       |      |        | Click|
  *                                 `--------------------'       `----------------------'
  */
-[_MOUSE] = KEYMAP(
+[_MOUSE] = LAYOUT_ergodox(
         // left hand
         _______, _______,  _______,   _______,   _______,   _______,   _______,
         _______, _______,  KC_WH_U,   KC_MS_U,   KC_WH_D,   _______,   _______,
@@ -466,7 +466,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      |      |       |      |        |      |
  *                                 `--------------------'       `----------------------'
  */
-[_ADJUST] = KEYMAP(
+[_ADJUST] = LAYOUT_ergodox(
         // left hand
         _______, _______,  _______,   _______,   _______,   _______,   _______,
         _______, RESET,    _______,   _______,   _______,   _______,   _______,
@@ -510,7 +510,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
-[_SYMB] = KEYMAP(
+[_SYMB] = LAYOUT_ergodox(
        // left hand
        VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
        _______,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,_______,
@@ -552,7 +552,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
-[_MDIA] = KEYMAP(
+[_MDIA] = LAYOUT_ergodox(
        _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, KC_MS_U, _______, _______, _______,
        _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,
diff --git a/keyboards/ergotravel/ergotravel.h b/keyboards/ergotravel/ergotravel.h
index 353000061a..10bc4e2bb9 100644
--- a/keyboards/ergotravel/ergotravel.h
+++ b/keyboards/ergotravel/ergotravel.h
@@ -9,16 +9,16 @@
 
 // Used to create a keymap using only KC_ prefixed keys
 #define LAYOUT_kc( \
-    L00, L01, L02, L03, L04, L05,L06,            R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15,L16,            R10, R11, R12, R13, R14, R15, R16,\
-    L20, L21, L22, L23, L24, L25,L26,            R20, R21, R22, R23, R24, R25, R26,\
-    L30, L31, L32, L33, L34, L35,                R30, R31, R32, R33, R34, R35 \
+    L00, L01, L02, L03, L04, L05, L06,       R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16,       R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26,       R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33,      L34, L35,       R30, R31,      R32, R33, R34, R35  \
     ) \
     LAYOUT( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06,                    KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16,                    KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26,                    KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35,                              KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
+        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L06,       KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, KC_##R06, \
+        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L16,       KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, KC_##R16, \
+        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L26,       KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, KC_##R26, \
+        KC_##L30, KC_##L31, KC_##L32, KC_##L33,           KC_##L34, KC_##L35,       KC_##R30, KC_##R31,           KC_##R32, KC_##R33, KC_##R34, KC_##R35  \
     )
 
 #endif
\ No newline at end of file
diff --git a/keyboards/ergotravel/info.json b/keyboards/ergotravel/info.json
index c92ea720cb..c0e5cc6368 100644
--- a/keyboards/ergotravel/info.json
+++ b/keyboards/ergotravel/info.json
@@ -1,15 +1,16 @@
 {
-    "keyboard_name": "ErgoTravel", 
-    "manufacturer": "jpconstantineau", 
-    "identifier": "0x1256", 
-    "url": "https://github.com/jpconstantineau/ErgoTravel", 
-    "maintainer": "qmk", 
-    "processor": "atmega32u4",  
-    "width": 14.5, 
-    "height": 5, 
-    "layouts": {
-        "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7.5, "y":4}, {"x":8.5, "y":4}, {"x":9.5, "y":4}]
-        }
+  "keyboard_name": "ErgoTravel",
+  "manufacturer": "jpconstantineau",
+  "identifier": "0x1256",
+  "url": "https://github.com/jpconstantineau/ErgoTravel",
+  "maintainer": "qmk",
+  "processor": "atmega32u4",
+  "width": 16,
+  "height": 5,
+  "layouts": {
+    "LAYOUT": {
+      "key_count": 54,
+      "layout": [{"label":"L00", "x":0, "y":0.375}, {"label":"L01", "x":1, "y":0.25}, {"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.5}, {"label":"R00", "x":9, "y":0.5}, {"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.25}, {"label":"R06", "x":15, "y":0.375}, {"label":"L10", "x":0, "y":1.375}, {"label":"L11", "x":1, "y":1.25}, {"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.5}, {"label":"R10", "x":9, "y":1.5}, {"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.25}, {"label":"R16", "x":15, "y":1.375}, {"label":"L20", "x":0, "y":2.375}, {"label":"L21", "x":1, "y":2.25}, {"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.5, "y":3}, {"label":"R20", "x":8.5, "y":3}, {"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.25}, {"label":"R26", "x":15, "y":2.375}, {"label":"L30", "x":0, "y":3.375}, {"label":"L31", "x":1, "y":3.25}, {"label":"L32", "x":2, "y":3.125}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":5.5, "y":4}, {"label":"L35", "x":6.5, "y":4}, {"label":"R30", "x":8.5, "y":4}, {"label":"R31", "x":9.5, "y":4}, {"label":"R32", "x":12, "y":3}, {"label":"R33", "x":13, "y":3.125}, {"label":"R34", "x":14, "y":3.25}, {"label":"R35", "x":15, "y":3.375}]
     }
+  }
 }
diff --git a/keyboards/ergotravel/keymaps/default/keymap.c b/keyboards/ergotravel/keymaps/default/keymap.c
index ef168a5362..d6f8d11715 100644
--- a/keyboards/ergotravel/keymaps/default/keymap.c
+++ b/keyboards/ergotravel/keymaps/default/keymap.c
@@ -14,77 +14,63 @@ enum custom_keycodes {
   ADJUST,
 };
 
-#define KC_ KC_TRNS
+// #define KC_ KC_TRNS
 #define _______ KC_TRNS
 
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_ADJT ADJUST
-#define KC_RST RESET
-#define KC_BL_S BL_STEP
-#define KC_DBUG DEBUG
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
-#define KC_RSAI RGB_SAI
-#define KC_RSAD RGB_SAD
-#define KC_RVAI RGB_VAI
-#define KC_RVAD RGB_VAD
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_QWERTY] = LAYOUT_kc(
-  //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-     ESC , Q  , W  , E  , R  , T  ,LBRC,      RBRC, Y  , U  , I  , O  , P  ,BSPC,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     TAB , A  , S  , D  , F  , G  , A,          A,  H  , J  , K  , L  ,SCLN,QUOT,
-  //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-     LSFT, Z  , X  , C  , V  , B  , A,        SPC,  N  , M  ,COMM,DOT ,SLSH,ENT ,
-  //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-     LCTL,LGUI,LALT,ADJT,LOWR,SPC,                 SPC, RASE,LEFT, UP ,DOWN,RIGHT
-  //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
+  [_QWERTY] = LAYOUT(
+  //,--------+--------+--------+--------+--------+--------+--------.        ,--------+--------+--------+--------+--------+--------+--------.
+     KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,          KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_A,             KC_A,    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_A,             KC_SPC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL, KC_LGUI, KC_LALT, ADJUST,           LOWER,   KC_SPC,           KC_SPC,  RAISE,            KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
+  //`--------+--------+--------+--------+--------+--------+--------/        \--------+--------+--------+--------+--------+--------+--------'
   ),
 
-  [_LOWER] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-      GRAVE, 1  , 2  , 3  , 4  , 5  , A,           B,  6  , 7  , 8  , 9  , 0  ,DEL,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       TAB , F1 , F2 , F3 , F4 , F5 , F6 ,         D,  Y  ,MINS, EQL,LBRC,RBRC,BSLS,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       LSFT, F7 , F8 , F9 , F10, F11, F12,       SPC,  N  , M ,COMM,DOT ,SLSH,ENT ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-       LCTL,LGUI,LALT,ADJT,LOWR,SPC,                 SPC, RASE,LEFT, UP ,DOWN,RIGHT
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
+  [_LOWER] = LAYOUT(
+  //,--------+--------+--------+--------+--------+--------+--------.        ,--------+--------+--------+--------+--------+--------+--------.
+     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_A,             KC_B,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     KC_TAB,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_D,    KC_Y,    KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     KC_LSFT, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_SPC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL, KC_LGUI, KC_LALT, ADJUST,           LOWER,   KC_SPC,           KC_SPC,  RAISE,            KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
+  //`--------+--------+--------+--------+--------+--------+--------/        \--------+--------+--------+--------+--------+--------+--------'
   ),
 
-  [_RAISE] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-       ESC , 1  , 2  , 3  , 4  , 5  , A,          B,  6  , 7  , 8  , 9  , 0  ,BSPC,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       TAB , Q  , W  , E  , R  , T  , C ,         D,  Y  , U  , I  , O  , P  ,DEL ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       LSFT, Z  , X  , C  , V  , B  , A,        SPC,  N  , M  ,COMM,DOT ,SLSH,ENT ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-       LCTL,LGUI,LALT,ADJT,LOWR,SPC,                 SPC, RASE,LEFT, UP ,DOWN,RIGHT
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
+  [_RAISE] = LAYOUT(
+  //,--------+--------+--------+--------+--------+--------+--------.        ,--------+--------+--------+--------+--------+--------+--------.
+     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_A,             KC_B,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_C,             KC_D,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_A,             KC_SPC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL, KC_LGUI, KC_LALT, ADJUST,           LOWER,   KC_SPC,           KC_SPC,  RAISE,            KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
+  //`--------+--------+--------+--------+--------+--------+--------/        \--------+--------+--------+--------+--------+--------+--------'
   ),
 
-  [_ADJUST] = LAYOUT_kc(
-    //,----+----+----+----+----+----+----.     ,----+----+----+----+----+----+----.
-       ESC , F1 , F2 , F3 , F4 , F5 , F6,         F7,  F8, F9 ,F10 , F11, F12,BSPC,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       TAB , Q  , W  , E  , R  , T  , C ,         D,  Y  , U  , I  , O  , P  ,DEL ,
-    //|----+----+----+----+----+----+----|     |----+----+----+----+----+----+----|
-       LSFT, Z  , X  , C  , V  , B  , A,        SPC,  N  , M  ,COMM,DOT ,SLSH,ENT ,
-    //|----+----+----+----+----+----+----.     .----+----+----+----+----+----+----|
-       LCTL,LGUI,LALT,ADJT,LOWR,SPC,                 SPC, RASE,LEFT, UP ,DOWN,RIGHT
-    //`----+----+----+--+-+----/----/               \----\----+----+----+----+----'
+  [_ADJUST] = LAYOUT(
+  //,--------+--------+--------+--------+--------+--------+--------.        ,--------+--------+--------+--------+--------+--------+--------.
+     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_C,             KC_D,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,