[Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows (#12259)

* cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows

* Made the layout data easier to read.
  * helix/rev2/keymaps/five_rows/keymap.c
  * helix/rev3_5rows/keymaps/five_rows/keymap.c

* The following two were made the same.
  * keymaps/five_rows/config.h
  * keymaps/five_rows/oled_display.c

The binary of the compilation result has not changed.

* update keyboards/helix/rev2/keymaps/five_rows/rules.mk

KEYBOARD_LOCAL_FEATURES_MK was moved to the end.

* add '#define DISABLE_SYNC_TIMER' into helix/rev3_5rows/keymaps/five_rows/config.h

The sync timer features worsen the matrix scan rate of the Helix keyboard. I'm not sure if it makes sense to have sync timer features enabled on the Helix keyboard. So in my keymap I disable this.

6 files changed, 353 insertions, 339 deletions

diff --git a/keyboards/helix/rev2/keymaps/five_rows/config.h b/keyboards/helix/rev2/keymaps/five_rows/config.h
index cd76af4faf..b9961f5c48 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/config.h
+++ b/keyboards/helix/rev2/keymaps/five_rows/config.h
@@ -35,6 +35,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // If you need more program area, try select and reduce rgblight modes to use.
 
+#define DISABLE_SYNC_TIMER
+
 // Selection of RGBLIGHT MODE to use.
 #undef RGBLIGHT_ANIMATIONS
 #undef RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/helix/rev2/keymaps/five_rows/keymap.c b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
index a2ec108624..16eff49244 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
@@ -42,6 +42,8 @@ enum custom_keycodes {
   RGBRST
 };
 
+// clang-format off
+
 #define LAYOUT_wrapper(...)    LAYOUT(__VA_ARGS__)
 
 //Macros
@@ -49,24 +51,26 @@ enum custom_keycodes {
 #define XXXX      XXXXXXX
 #define ____      _______
 #define KC_ADJ    MO(_ADJUST)
-#define KC_LSMI   LSFT(KC_MINS)
-#define KC_LSEQ   LSFT(KC_EQL)
-#define KC_LSRB   LSFT(KC_RBRC)
-#define KC_LSLB   LSFT(KC_LBRC)
 
-#define _1_2_3_4_5           KC_1, KC_2, KC_3, KC_4, KC_5
-#define _6_7_8_9_0           KC_6, KC_7, KC_8, KC_9, KC_0
-#define L_LOWER2_CAPS_LALT_LGUI_SPC_RABS \
+#define _1_____2_____3_____4_____5   KC_1, KC_2, KC_3, KC_4, KC_5
+#define _6_____7_____8_____9_____0   KC_6, KC_7, KC_8, KC_9, KC_0
+#define LOWER__LOWER__CAPS__LALT__LGUI__SPC__RABS \
     KC_LOWER, KC_LOWER, KC_CAPS, KC_LALT, KC_LGUI, KC_SPC, LT(_RAISE,KC_BSPC)
-#define R_RAEN_SPC_RGUI_RALT_APP_LOWER2 \
+#define RAEN___SPC___RGUI__RALT__APP___LOWER__LOWER  \
     LT(_RAISE,KC_ENT), KC_SPC, KC_RGUI, KC_RALT,  KC_APP, KC_LOWER, KC_LOWER
-
+#define GRV__QUOT  KC_GRV, KC_QUOT
 
 #if MATRIX_ROWS == 10 // HELIX_ROWS == 5
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  /* Qwerty
-   * ,-----------------------------------.           ,-----------------------------------.
+  /* Qwerty */
+#define Q_____W_____E_____R_____T     KC_Q, KC_W, KC_E, KC_R, KC_T
+#define Y_____U_____I_____O_____P     KC_Y, KC_U, KC_I, KC_O, KC_P
+#define A_____S_____D_____F_____G     KC_A, KC_S, KC_D, KC_F, KC_G
+#define H_____J_____K_____L____SCLN   KC_H, KC_J, KC_K, KC_L, KC_SCLN
+#define Z_____X_____C_____V_____B     KC_Z, KC_X, KC_C, KC_V, KC_B
+#define N_____M____COMM__DOT___SLSH   KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH
+  /* ,-----------------------------------.           ,-----------------------------------.
    * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
    * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
    * | Tab |  Q  |  W  |  E  |  R  |  T  |           |  Y  |  U  |  I  |  O  |  P  |  \  |
@@ -78,23 +82,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
    * `-----------------------------------------------------------------------------------'
    */
-#define _Q_W_E_R_T           KC_Q, KC_W, KC_E, KC_R, KC_T
-#define _Y_U_I_O_P           KC_Y, KC_U, KC_I, KC_O, KC_P
-#define _A_S_D_F_G           KC_A, KC_S, KC_D, KC_F, KC_G
-#define _H_J_K_L_SCLN        KC_H, KC_J, KC_K, KC_L, KC_SCLN
-#define _Z_X_C_V_B           KC_Z, KC_X, KC_C, KC_V, KC_B
-#define _N_M_COMM_DOT_SLSH   KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH
-
-  [_QWERTY] = LAYOUT_wrapper( \
-    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,         KC_BSPC, \
-    KC_TAB,   _Q_W_E_R_T,                       _Y_U_I_O_P,         KC_BSLS, \
-    KC_LCTL,  _A_S_D_F_G,                       _H_J_K_L_SCLN,      KC_RCTL, \
-    KC_LSFT,  _Z_X_C_V_B,     KC_GRV,  KC_QUOT, _N_M_COMM_DOT_SLSH, KC_RSFT, \
-    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
+  [_QWERTY] = LAYOUT_wrapper(
+    KC_ESC,  _1_____2_____3_____4_____5,               _6_____7_____8_____9_____0,   KC_BSPC,
+    KC_TAB,   Q_____W_____E_____R_____T,                Y_____U_____I_____O_____P,   KC_BSLS,
+    KC_LCTL,  A_____S_____D_____F_____G,                H_____J_____K_____L____SCLN, KC_RCTL,
+    KC_LSFT,  Z_____X_____C_____V_____B,   GRV__QUOT,   N_____M____COMM__DOT___SLSH, KC_RSFT,
+     LOWER__LOWER__CAPS__LALT__LGUI__SPC__RABS, RAEN___SPC___RGUI__RALT__APP___LOWER__LOWER
    ),
 
-  /* Colemak
-   * ,-----------------------------------.           ,-----------------------------------.
+  /* Colemak */
+#define Q_____W_____F_____P_____G     KC_Q, KC_W, KC_F, KC_P, KC_G
+#define J_____L_____U_____Y____SCLN   KC_J, KC_L, KC_U, KC_Y, KC_SCLN
+#define A_____R_____S_____T_____D     KC_A, KC_R, KC_S, KC_T, KC_D
+#define H_____N_____E_____I_____O     KC_H, KC_N, KC_E, KC_I, KC_O
+#define Z_____X_____C_____V_____B     KC_Z, KC_X, KC_C, KC_V, KC_B
+#define K_____M____COMM__DOT___SLSH   KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH
+  /* ,-----------------------------------.           ,-----------------------------------.
    * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
    * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
    * | Tab |  Q  |  W  |  F  |  P  |  G  |           |  J  |  L  |  U  |  Y  |  ;  |  \  |
@@ -106,23 +109,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
    * `-----------------------------------------------------------------------------------'
    */
-#define _Q_W_F_P_G           KC_Q, KC_W, KC_F, KC_P, KC_G
-#define _J_L_U_Y_SCLN        KC_J, KC_L, KC_U, KC_Y, KC_SCLN
-#define _A_R_S_T_D           KC_A, KC_R, KC_S, KC_T, KC_D
-#define _H_N_E_I_O           KC_H, KC_N, KC_E, KC_I, KC_O
-#define _Z_X_C_V_B           KC_Z, KC_X, KC_C, KC_V, KC_B
-#define _K_M_COMM_DOT_SLSH   KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH
-
-  [_COLEMAK] = LAYOUT_wrapper( \
-    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,         KC_BSPC, \
-    KC_TAB,   _Q_W_F_P_G,                       _J_L_U_Y_SCLN,      KC_BSLS, \
-    KC_LCTL,  _A_R_S_T_D,                       _H_N_E_I_O,         KC_RCTL, \
-    KC_LSFT,  _Z_X_C_V_B,     KC_GRV,  KC_QUOT, _K_M_COMM_DOT_SLSH, KC_RSFT, \
-    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
-  ),
+  [_COLEMAK] = LAYOUT_wrapper(
+    KC_ESC,  _1_____2_____3_____4_____5,               _6_____7_____8_____9_____0,   KC_BSPC,
+    KC_TAB,   Q_____W_____F_____P_____G,                J_____L_____U_____Y____SCLN, KC_BSLS,
+    KC_LCTL,  A_____R_____S_____T_____D,                H_____N_____E_____I_____O,   KC_RCTL,
+    KC_LSFT,  Z_____X_____C_____V_____B,   GRV__QUOT,   K_____M____COMM__DOT___SLSH, KC_RSFT,
+     LOWER__LOWER__CAPS__LALT__LGUI__SPC__RABS, RAEN___SPC___RGUI__RALT__APP___LOWER__LOWER
+   ),
 
-  /* Dvorak
-   * ,-----------------------------------.           ,-----------------------------------.
+  /* Dvorak */
+#define QUOT_COMM___DOT____P_____Y   KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y
+#define  F_____G_____C_____R_____L   KC_F, KC_G, KC_C, KC_R, KC_L
+#define  A_____O_____E_____U_____I   KC_A, KC_O, KC_E, KC_U, KC_I
+#define  D_____H_____T_____N_____S   KC_D, KC_H, KC_T, KC_N, KC_S
+#define SCLN___Q_____J_____K_____X   KC_SCLN, KC_Q, KC_J, KC_K, KC_X
+#define  B_____M_____W_____V_____Z   KC_B, KC_M, KC_W, KC_V, KC_Z
+#define GRV__SLSH KC_GRV,  KC_SLSH
+  /* ,-----------------------------------.           ,-----------------------------------.
    * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
    * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
    * | Tab |  '  |  ,  |  .  |  P  |  Y  |           |  F  |  G  |  C  |  R  |  L  |  \  |
@@ -134,23 +137,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
    * `-----------------------------------------------------------------------------------'
    */
-#define _QUOT_COMM_DOT_P_Y   KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y
-#define _F_G_C_R_L           KC_F, KC_G, KC_C, KC_R, KC_L
-#define _A_O_E_U_I           KC_A, KC_O, KC_E, KC_U, KC_I
-#define _D_H_T_N_S           KC_D, KC_H, KC_T, KC_N, KC_S
-#define _SCLN_Q_J_K_X        KC_SCLN, KC_Q, KC_J, KC_K, KC_X
-#define _B_M_W_V_Z           KC_B, KC_M, KC_W, KC_V, KC_Z
-
-  [_DVORAK] = LAYOUT_wrapper( \
-    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,    KC_BSPC, \
-    KC_TAB,   _QUOT_COMM_DOT_P_Y,               _F_G_C_R_L,    KC_BSLS, \
-    KC_LCTL,  _A_O_E_U_I,                       _D_H_T_N_S,    KC_RCTL, \
-    KC_LSFT,  _SCLN_Q_J_K_X,  KC_GRV,  KC_SLSH, _B_M_W_V_Z,    KC_RSFT, \
-    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
+  [_DVORAK] = LAYOUT_wrapper(
+    KC_ESC,  _1_____2_____3_____4_____5,               _6_____7_____8_____9_____0,   KC_BSPC,
+    KC_TAB,  QUOT_COMM___DOT____P_____Y,                F_____G_____C_____R_____L,   KC_BSLS,
+    KC_LCTL,  A_____O_____E_____U_____I,                D_____H_____T_____N_____S,   KC_RCTL,
+    KC_LSFT, SCLN___Q_____J_____K_____X,   GRV__SLSH,   B_____M_____W_____V_____Z,   KC_RSFT,
+     LOWER__LOWER__CAPS__LALT__LGUI__SPC__RABS, RAEN___SPC___RGUI__RALT__APP___LOWER__LOWER
    ),
 
-  /* Eucalyn (http://eucalyn.hatenadiary.jp/entry/about-eucalyn-layout)
-   * ,-----------------------------------.           ,-----------------------------------.
+  /* Eucalyn (http://eucalyn.hatenadiary.jp/entry/about-eucalyn-layout) */
+#define Q_____W___COMM___DOT__SCLN   KC_Q, KC_W, KC_COMM, KC_DOT, KC_SCLN
+#define M_____R_____D_____Y_____P    KC_M, KC_R, KC_D, KC_Y, KC_P
+#define A_____O_____E_____I_____U    KC_A, KC_O, KC_E, KC_I, KC_U
+#define G_____T_____K_____S_____N    KC_G, KC_T, KC_K, KC_S, KC_N
+#define Z_____X_____C_____V_____F    KC_Z, KC_X, KC_C, KC_V, KC_F
+#define B_____H_____J_____L____SLSH  KC_B, KC_H, KC_J, KC_L, KC_SLSH
+  /* ,-----------------------------------.           ,-----------------------------------.
    * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
    * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
    * | Tab |  Q  |  W  |  ,  |  .  |  ;  |           |  M  |  R  |  D  |  Y  |  P  |  \  |
@@ -162,23 +164,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
    * `-----------------------------------------------------------------------------------'
    */
-#define _Q_W_COMM_DOT_SCLN   KC_Q, KC_W, KC_COMM, KC_DOT, KC_SCLN
-#define _M_R_D_Y_P           KC_M, KC_R, KC_D, KC_Y, KC_P
-#define _A_O_E_I_U           KC_A, KC_O, KC_E, KC_I, KC_U
-#define _G_T_K_S_N           KC_G, KC_T, KC_K, KC_S, KC_N
-#define _Z_X_C_V_F           KC_Z, KC_X, KC_C, KC_V, KC_F
-#define _B_H_J_L_SLSH        KC_B, KC_H, KC_J, KC_L, KC_SLSH
-
-  [_EUCALYN] = LAYOUT_wrapper( \
-    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,     KC_BSPC, \
-    KC_TAB,   _Q_W_COMM_DOT_SCLN,               _M_R_D_Y_P,     KC_BSLS, \
-    KC_LCTL,  _A_O_E_I_U,                       _G_T_K_S_N,     KC_RCTL, \
-    KC_LSFT,  _Z_X_C_V_F,     KC_GRV,  KC_QUOT, _B_H_J_L_SLSH,  KC_RSFT, \
-    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
-  ),
+  [_EUCALYN] = LAYOUT_wrapper(
+    KC_ESC,  _1_____2_____3_____4_____5,               _6_____7_____8_____9_____0,   KC_BSPC,
+    KC_TAB,   Q_____W___COMM___DOT__SCLN,               M_____R_____D_____Y_____P,   KC_BSLS,
+    KC_LCTL,  A_____O_____E_____I_____U,                G_____T_____K_____S_____N,   KC_RCTL,
+    KC_LSFT,  Z_____X_____C_____V_____F,   GRV__QUOT,   B_____H_____J_____L____SLSH, KC_RSFT,
+     LOWER__LOWER__CAPS__LALT__LGUI__SPC__RABS, RAEN___SPC___RGUI__RALT__APP___LOWER__LOWER
+   ),
 
-  /* Keypad
-   * ,-----------------------------------.           ,-----------------------------------.
+  /* Keypad */
+#define KP_TAB__PSLS_PAST  KC_TAB,  KC_PSLS, KC_PAST
+#define KP__7_____8_____9  KC_KP_7, KC_KP_8, KC_KP_9
+#define KP__4_____5_____6  KC_KP_4, KC_KP_5, KC_KP_6
+#define KP__1_____2_____3  KC_KP_1, KC_KP_2, KC_KP_3
+#define KP__0___COMM_PDOT  KC_KP_0, KC_COMM, KC_PDOT
+#define F1___F6  KC_F1, KC_F6
+#define F2___F7  KC_F2, KC_F7
+#define F3___F8  KC_F3, KC_F8
+#define F4___F9  KC_F4, KC_F9
+#define F5__F10  KC_F5, KC_F10
+#define FF12   LT(_PADFUNC,KC_F12)
+  /* ,-----------------------------------.           ,-----------------------------------.
    * | Tab |  /  |  *  | Del |  F1 |  F6 |           |  F1 |  F6 | Del | Tab |  /  |  *  |
    * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
    * |  7  |  8  |  9  | BS  |  F2 |  F7 |           |  F2 |  F7 | BS  |  7  |  8  |  9  |
@@ -190,25 +196,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |  0  |  ,  |  .  |Enter|  F5 |  F10| F12 | F12 |  F5 |  F10|Enter|  0  |  ,  |  .  |
    * `-----------------------------------------------------------------------------------'
    */
-#define KP_TOP KC_TAB,  KC_PSLS, KC_PAST
-#define KP_789 KC_KP_7, KC_KP_8, KC_KP_9
-#define KP_456 KC_KP_4, KC_KP_5, KC_KP_6
-#define KP_123 KC_KP_1, KC_KP_2, KC_KP_3
-#define KP_BTM KC_KP_0, KC_COMM, KC_PDOT
-#define F_1_6  KC_F1, KC_F6
-#define F_2_7  KC_F2, KC_F7
-#define F_3_8  KC_F3, KC_F8
-#define F_4_9  KC_F4, KC_F9
-#define F_510  KC_F5, KC_F10
-#define FF12   LT(_PADFUNC,KC_F12)
-
-  [_KEYPAD] = LAYOUT_wrapper( \
-    KP_TOP, KC_DEL,  F_1_6,                     F_1_6,  KC_DEL, KP_TOP, \
-    KP_789, KC_BSPC, F_2_7,                     F_2_7, KC_BSPC, KP_789, \
-    KP_456, KC_PMNS, F_3_8,                     F_3_8, KC_PMNS, KP_456, \
-    KP_123, KC_PPLS, F_4_9,  KC_F11,  KC_F11,  F_4_9, KC_PPLS, KP_123, \
-    KP_BTM, KC_PENT, F_510,    FF12,    FF12,  F_510, KC_PENT, KP_BTM  \
-  ),
+  [_KEYPAD] = LAYOUT_wrapper(
+    KP_TAB__PSLS_PAST, KC_DEL,  F1___F6,                F1___F6, KC_DEL,  KP_TAB__PSLS_PAST,
+    KP__7_____8_____9, KC_BSPC, F2___F7,                F2___F7, KC_BSPC, KP__7_____8_____9,
+    KP__4_____5_____6, KC_PMNS, F3___F8,                F3___F8, KC_PMNS, KP__4_____5_____6,
+    KP__1_____2_____3, KC_PPLS, F4___F9, KC_F11,KC_F11, F4___F9, KC_PPLS, KP__1_____2_____3,
+    KP__0___COMM_PDOT, KC_PENT, F5__F10,   FF12,  FF12, F5__F10, KC_PENT, KP__0___COMM_PDOT
+   ),
 
   /*  AUX modifier key layer
    * ,-----------------------------------.           ,-----------------------------------.
@@ -223,16 +217,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |     | 00  |     |     |     |     |     |     |     |     |     |     | 00  |     |
    * `-----------------------------------------------------------------------------------'
    */
-  [_KAUX] = LAYOUT( \
-      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
-      ____,ZERO2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,ZERO2, ____ \
+  [_KAUX] = LAYOUT(
+      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____,
+      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____,
+      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____,
+      ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
+      ____,ZERO2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,ZERO2, ____
    ),
 
-  /*  Keypad function layer
-   * ,-----------------------------------------.             ,-----------------------------------------.
+  /*  Keypad function layer */
+#define PAUS__SLCK__PSCR              KC_PAUS, KC_SLCK, KC_PSCR
+#define PSCR__SLCK__PAUS              KC_PSCR, KC_SLCK, KC_PAUS
+#define HOME___UP___PGUP              KC_HOME, KC_UP,   KC_PGUP
+#define PGUP___UP___HOME              KC_PGUP, KC_UP,   KC_HOME
+#define DEL____INS__LEFT__DOWN__RGHT  KC_DEL,  KC_INS,  KC_LEFT, KC_DOWN, KC_RGHT
+#define LEFT__DOWN__RGHT___INS___DEL  KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL
+#define PGDN___ADJ___ADJ__PGDN        KC_PGDN, KC_ADJ,  KC_ADJ,  KC_PGDN
+  /* ,-----------------------------------------.             ,-----------------------------------------.
    * |      |      |      | Pause| ScrLk| PtrSc|             | PtrSc| ScrLk| Pause|      |      |      |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
    * |      |      |      | Home |  Up  | PgUp |             | PgUp |  Up  | Home |      |      |      |
@@ -244,55 +245,53 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-#define _PAUS_SLCK_PSCR           KC_PAUS, KC_SLCK, KC_PSCR
-#define _PSCR_SLCK_PAUS           KC_PSCR, KC_SLCK, KC_PAUS
-#define _HOME_UP_PGUP             KC_HOME, KC_UP,   KC_PGUP
-#define _PGUP_UP_HOME             KC_PGUP, KC_UP,   KC_HOME
-#define _DEL_INS_LEFT_DOWN_RGHT   KC_DEL,  KC_INS,  KC_LEFT, KC_DOWN, KC_RGHT
-#define _LEFT_DOWN_RGHT_INS_DEL   KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL
-#define _PGDN_ADJ_ADJ_PGDN        KC_PGDN, KC_ADJ,  KC_ADJ,  KC_PGDN
-
-  [_PADFUNC] = LAYOUT_wrapper( \
-      XXXX, XXXX, XXXX, _PAUS_SLCK_PSCR,               _PSCR_SLCK_PAUS,       XXXX, XXXX, XXXX, \
-      XXXX, XXXX, XXXX,   _HOME_UP_PGUP,               _PGUP_UP_HOME,         XXXX, XXXX, XXXX, \
-      XXXX,     _DEL_INS_LEFT_DOWN_RGHT,               _LEFT_DOWN_RGHT_INS_DEL,           XXXX, \
-      XXXX, XXXX, XXXX, KC_END, XXXX,   _PGDN_ADJ_ADJ_PGDN,     XXXX, KC_END, XXXX, XXXX, XXXX, \
-      XXXX, XXXX, XXXX, XXXX,   XXXX, XXXX, ____, ____,   XXXX, XXXX,   XXXX, XXXX, XXXX, XXXX \
+  [_PADFUNC] = LAYOUT_wrapper(
+    XXXX, XXXX, XXXX, PAUS__SLCK__PSCR,             PSCR__SLCK__PAUS, XXXX, XXXX, XXXX,
+    XXXX, XXXX, XXXX, HOME___UP___PGUP,             PGUP___UP___HOME, XXXX, XXXX, XXXX,
+    XXXX, DEL____INS__LEFT__DOWN__RGHT,             LEFT__DOWN__RGHT___INS___DEL, XXXX,
+    XXXX, XXXX, XXXX,KC_END,XXXX, PGDN___ADJ___ADJ__PGDN, XXXX,KC_END,XXXX, XXXX, XXXX,
+    XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, ____, ____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX
    ),
 
-  /* Lower
-   * ,-----------------------------------------.             ,-----------------------------------------.
+  /* Lower */
+#define F1____F2____F3____F4____F5     KC_F1, KC_F2, KC_F3, KC_F4, KC_F5
+#define F6____F7____F8____F9____F10    KC_F6, KC_F7, KC_F8, KC_F9, KC_F10
+#define XXXX__PAUS__SLCK___INS         XXXX, KC_PAUS, KC_SLCK, KC_INS
+#define XXXX___INS__SLCK__PAUS__XXXX   XXXX, KC_INS,  KC_SLCK, KC_PAUS, XXXX
+#define ADJ___ADJ                      KC_ADJ,  KC_ADJ
+#define HOME__XXXX___UP____DEL__PGUP   KC_HOME, XXXX, KC_UP, KC_DEL, KC_PGUP
+#define PGUP___DEL___UP___XXXX__HOME   KC_PGUP, KC_DEL,  KC_UP, XXXX, KC_HOME
+#define END__LEFT__DOWN__RGHT__PGDN    KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN
+#define PGDN__LEFT__DOWN__RGHT___END   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_END
+  /* ,-----------------------------------------.             ,-----------------------------------------.
    * |      |  F1  |  F2  |  F3  |  F4  |  F5  |             |  F6  |  F7  |  F8  |  F9  |  F10 | F11  |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
    * |      |      |Pause | ScrLk| Ins  |      |             |      | Ins  | ScrLk|Pause |      | F12  |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      | PgUp |      | Up   |Delete| Home |             | Home |Delete| Up   |      | PgUp |      |
+   * |      | Home |      | Up   |Delete| PgUp |             | PgUp |Delete| Up   |      | Home |      |
    * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | PgDn | Left | Down | Right| End  |Adjust|Adjust| End  | Left | Down | Right| PgDn |      |
+   * |      | End  | Left | Down | Right| PgDn |Adjust|Adjust| PgDn | Left | Down | Right| End  |      |
    * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
    * |      |      | PrtSc|      |      |      |      |      |      |      |      | PrtSc|      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-#define _F1_F2_F3_F4_F5           KC_F1, KC_F2, KC_F3, KC_F4, KC_F5
-#define _F6_F7_F8_F9_F10_F11      KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11
-#define _PAUS_SLCK_INS            KC_PAUS, KC_SLCK, KC_INS
-#define _INS_SLCK_PAUS            KC_INS,  KC_SLCK, KC_PAUS
-#define _ADJ_ADJ                  KC_ADJ,  KC_ADJ
-#define _UP_DEL_PGUP              KC_UP,   KC_DEL,  KC_PGUP
-#define _PGUP_DEL_UP              KC_PGUP, KC_DEL,  KC_UP
-#define _END_LEFT_DOWN_RGHT_PGDN  KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN
-#define _PGDN_LEFT_DOWN_RGHT_END  KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_END
-
-  [_LOWER] = LAYOUT_wrapper( \
-      XXXX, _F1_F2_F3_F4_F5,                             _F6_F7_F8_F9_F10_F11, \
-      XXXX, XXXX,    _PAUS_SLCK_INS,   XXXX,             XXXX,  _INS_SLCK_PAUS,    XXXX, KC_F12, \
-      ____, KC_HOME, XXXX, _UP_DEL_PGUP,                 _PGUP_DEL_UP,      XXXX, KC_HOME, ____, \
-      ____, _END_LEFT_DOWN_RGHT_PGDN,        XXXX, XXXX, _PGDN_LEFT_DOWN_RGHT_END,         ____, \
-      ____, ____, KC_PSCR, ____, ____, ____,  _ADJ_ADJ,  ____, ____, ____, KC_PSCR, ____, ____ \
-      ),
+  [_LOWER] = LAYOUT_wrapper(
+    XXXX,  F1____F2____F3____F4____F5,               F6____F7____F8____F9____F10, KC_F11,
+    XXXX, XXXX__PAUS__SLCK___INS, XXXX,             XXXX___INS__SLCK__PAUS__XXXX, KC_F12,
+    ____, HOME__XXXX___UP____DEL__PGUP,             PGUP___DEL___UP___XXXX__HOME,  ____,
+    ____,  END__LEFT__DOWN__RGHT__PGDN, XXXX, XXXX, PGDN__LEFT__DOWN__RGHT___END,  ____,
+    ____, ____,KC_PSCR,____, ____, ____, ADJ___ADJ, ____, ____, ____,KC_PSCR,____, ____
+   ),
 
-  /* Raise
-   * ,-----------------------------------------.             ,-----------------------------------------.
+  /* Raise */
+#define UNDS__MINS             KC_UNDS, KC_MINS
+#define EQL___PLUS             KC_EQL,  KC_PLUS
+#define LCBR__LBRC             KC_LCBR, KC_LBRC
+#define RBRC__RCBR             KC_RBRC, KC_RCBR
+#define MNXT__VOLD__VOLU__MPLY KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+#define EISU__EISU             xEISU, xEISU
+#define KANA__KANA             xKANA, xKANA
+  /* ,-----------------------------------------.             ,-----------------------------------------.
    * |      |      |      |      |      |      |             |      |      |      |      |      |      |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
    * |      |      |      |      |  _   |  -   |             |  =   |  +   |      |      |      |      |
@@ -304,19 +303,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-#define _LSMI_MINS             KC_LSMI, KC_MINS
-#define _EQL_LSEQ              KC_EQL,  KC_LSEQ
-#define _LSLB_LBRC             KC_LSLB, KC_LBRC
-#define _RBRC_LSRB             KC_RBRC, KC_LSRB
-#define _MNXT_VOLD_VOLU_MPLY   KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-
-  [_RAISE] = LAYOUT_wrapper( \
-      XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,             XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, \
-      XXXX, XXXX, XXXX, XXXX, _LSMI_MINS,             _EQL_LSEQ,  XXXX, XXXX, XXXX, XXXX, \
-      ____, XXXX, XXXX, XXXX, _LSLB_LBRC,             _RBRC_LSRB, XXXX, XXXX, XXXX, ____, \
-      ____, XXXX, XXXX, XXXX, XXXX,xEISU,xEISU, xKANA,xKANA, _MNXT_VOLD_VOLU_MPLY,  ____, \
-      _ADJ_ADJ,   XXXX, ____, ____, XXXX, ____, ____, XXXX, ____, ____, XXXX,   _ADJ_ADJ \
-      ),
+  [_RAISE] = LAYOUT_wrapper(
+    XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,             XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,
+    XXXX, XXXX, XXXX, XXXX, UNDS__MINS,             EQL___PLUS, XXXX, XXXX, XXXX, XXXX,
+    ____, XXXX, XXXX, XXXX, LCBR__LBRC,             RBRC__RCBR, XXXX, XXXX, XXXX, ____,
+    ____, XXXX, XXXX, XXXX, XXXX, EISU__EISU, KANA__KANA, MNXT__VOLD__VOLU__MPLY, ____,
+     ADJ___ADJ, XXXX, ____, ____, XXXX, ____, ____, XXXX, ____, ____, XXXX,  ADJ___ADJ
+   ),
 
   /* Adjust (Lower + Raise)
    * ,-----------------------------------------.             ,-----------------------------------------.
@@ -331,16 +324,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-  [_ADJUST] =  LAYOUT( \
-      XXXXXXX, KEYPAD,  DVORAK,  COLEMAK, EUCALYN,  QWERTY,          QWERTY,  EUCALYN, COLEMAK,  DVORAK,  KEYPAD, XXXXXXX, \
-      XXXXXXX, RESET,   RGBRST,  RGB_TOG,   AU_ON, AG_SWAP,          AG_SWAP,   AU_ON, RGB_TOG,  RGBRST, XXXXXXX, XXXXXXX, \
-      RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  AU_OFF, AG_NORM,          AG_NORM,  AU_OFF, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, \
-      RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, \
-      _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______ \
+  [_ADJUST] =  LAYOUT(
+      XXXXXXX, KEYPAD,  DVORAK,  COLEMAK, EUCALYN,  QWERTY,          QWERTY,  EUCALYN, COLEMAK,  DVORAK,  KEYPAD, XXXXXXX,
+      XXXXXXX, RESET,   RGBRST,  RGB_TOG,   AU_ON, AG_SWAP,          AG_SWAP,   AU_ON, RGB_TOG,  RGBRST, XXXXXXX, XXXXXXX,
+      RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  AU_OFF, AG_NORM,          AG_NORM,  AU_OFF, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI,
+      RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD,
+      _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______
    ),
 
-  /*  AUX modifier key layer
-   * ,-----------------------------------------.             ,-----------------------------------------.
+  /*  AUX modifier key layer */
+#define BSPC__RAEN KC_BSPC, LT(_RAISE,KC_ENT)
+  /* ,-----------------------------------------.             ,-----------------------------------------.
    * |      |      |      |      |      |      |             |      |      |      |      |      |      |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
    * |      |      |      |      |      |      |             |      |      |      |      |      |      |
@@ -352,14 +346,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |      |      |      |      |      |  BS  | Enter|      |      |      |      |      |      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-#define _BSPC_RAEN KC_BSPC, LT(_RAISE,KC_ENT)
-  [_AUX] = LAYOUT_wrapper( \
-      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, _BSPC_RAEN, ____, ____, ____, ____, ____, ____, ____ \
-      )
+  [_AUX] = LAYOUT_wrapper(
+    ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____,
+    ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____,
+    ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____,
+    ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
+    ____, ____, ____, ____, ____, BSPC__RAEN, ____, ____, ____, ____, ____, ____, ____
+   )
 };
 
 #else
diff --git a/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
index fbde2fe6a6..58b7ef4efc 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
@@ -35,6 +35,20 @@ ifneq ($(strip $(HELIX)),)
         LED_BACK_ENABLE = no
         LED_UNDERGLOW_ENABLE = no
     endif
+    ifneq ($(filter nooled no-oled,$(strip $1)),)
+        OLED_ENABLE = no
+    endif
+    ifeq ($(strip $1),oled)
+        OLED_ENABLE = yes
+    endif
+    ifneq ($(filter core-oled core_oled newoled new-oled olednew oled-new,$(strip $1)),)
+        OLED_ENABLE = yes
+        OLED_SELECT = core
+    endif
+    ifneq ($(filter local-oled local_oled oldoled old-oled oledold oled-old,$(strip $1)),)
+        OLED_ENABLE = yes
+        OLED_SELECT = local
+    endif
     ifeq ($(strip $1),console)
         CONSOLE_ENABLE = yes
     endif
@@ -79,10 +93,10 @@ ifeq ($(strip $(DEBUG_CONFIG)), yes)
     OPT_DEFS += -DDEBUG_CONFIG
 endif
 
-# convert Helix-specific options (that represent combinations of standard options)
-#   into QMK standard options.
-include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
-
 ifeq ($(strip $(OLED_ENABLE)), yes)
     SRC += oled_display.c
 endif
+
+# convert Helix-specific options (that represent combinations of standard options)
+#   into QMK standard options.
+include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h b/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h
index 205867e5b7..b9961f5c48 100644
--- a/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h
+++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h
@@ -22,19 +22,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#undef OLED_UPDATE_INTERVAL
-#define OLED_UPDATE_INTERVAL 50
-
 #undef TAPPING_TERM
 #define TAPPING_TERM 300
 #define PERMISSIVE_HOLD
 /* when TAPPING_TERM >= 500 same effect PERMISSIVE_HOLD.
    see tmk_core/common/action_tapping.c */
 
+#undef OLED_UPDATE_INTERVAL
+#define OLED_UPDATE_INTERVAL 50
+
 // place overrides here
 
 // If you need more program area, try select and reduce rgblight modes to use.
 
+#define DISABLE_SYNC_TIMER
+
 // Selection of RGBLIGHT MODE to use.
 #undef RGBLIGHT_ANIMATIONS
 #undef RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
index a2ec108624..16eff49244 100644
--- a/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
@@ -42,6 +42,8 @@ enum custom_keycodes {
   RGBRST
 };
 
+// clang-format off
+
 #define LAYOUT_wrapper(...)    LAYOUT(__VA_ARGS__)
 
 //Macros
@@ -49,24 +51,26 @@ enum custom_keycodes {
 #define XXXX      XXXXXXX
 #define ____      _______
 #define KC_ADJ    MO(_ADJUST)
-#define KC_LSMI   LSFT(KC_MINS)
-#define KC_LSEQ   LSFT(KC_EQL)
-#define KC_LSRB   LSFT(KC_RBRC)
-#define KC_LSLB   LSFT(KC_LBRC)
 
-#define _1_2_3_4_5           KC_1, KC_2, KC_3, KC_4, KC_5
-#define _6_7_8_9_0           KC_6, KC_7, KC_8, KC_9, KC_0
-#define L_LOWER2_CAPS_LALT_LGUI_SPC_RABS \
+#define _1_____2_____3_____4_____5   KC_1, KC_2, KC_3, KC_4, KC_5
+#define _6_____7_____8_____9_____0   KC_6, KC_7, KC_8, KC_9, KC_0
+#define LOWER__LOWER__CAPS__LALT__LGUI__SPC__RABS \
     KC_LOWER, KC_LOWER, KC_CAPS, KC_LALT, KC_LGUI, KC_SPC, LT(_RAISE,KC_BSPC)
-#define R_RAEN_SPC_RGUI_RALT_APP_LOWER2 \
+#define RAEN___SPC___RGUI__RALT__APP___LOWER__LOWER  \
     LT(_RAISE,KC_ENT), KC_SPC, KC_RGUI, KC_RALT,  KC_APP, KC_LOWER, KC_LOWER
-
+#define GRV__QUOT  KC_GRV, KC_QUOT
 
 #if MATRIX_ROWS == 10 // HELIX_ROWS == 5
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  /* Qwerty
-   * ,-----------------------------------.           ,-----------------------------------.
+  /* Qwerty */
+#define Q_____W_____E_____R_____T     KC_Q, KC_W, KC_E, KC_R, KC_T
+#define Y_____U_____I_____O_____P     KC_Y, KC_U, KC_I, KC_O, KC_P
+#define A_____S_____D_____F_____G     KC_A, KC_S, KC_D, KC_F, KC_G
+#define H_____J_____K_____L____SCLN   KC_H, KC_J, KC_K, KC_L, KC_SCLN
+#define Z_____X_____C_____V_____B     KC_Z, KC_X, KC_C, KC_V, KC_B
+#define N_____M____COMM__DOT___SLSH   KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH
+  /* ,-----------------------------------.           ,-----------------------------------.
    * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
    * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
    * | Tab |  Q  |  W  |  E  |  R  |  T  |           |  Y  |  U  |  I  |  O  |  P  |  \  |
@@ -78,23 +82,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
    * `-----------------------------------------------------------------------------------'
    */
-#define _Q_W_E_R_T           KC_Q, KC_W, KC_E, KC_R, KC_T
-#define _Y_U_I_O_P           KC_Y, KC_U, KC_I, KC_O, KC_P
-#define _A_S_D_F_G           KC_A, KC_S, KC_D, KC_F, KC_G
-#define _H_J_K_L_SCLN        KC_H, KC_J, KC_K, KC_L, KC_SCLN
-#define _Z_X_C_V_B           KC_Z, KC_X, KC_C, KC_V, KC_B
-#define _N_M_COMM_DOT_SLSH   KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH
-
-  [_QWERTY] = LAYOUT_wrapper( \
-    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,         KC_BSPC, \
-    KC_TAB,   _Q_W_E_R_T,                       _Y_U_I_O_P,         KC_BSLS, \
-    KC_LCTL,  _A_S_D_F_G,                       _H_J_K_L_SCLN,      KC_RCTL, \
-    KC_LSFT,  _Z_X_C_V_B,     KC_GRV,  KC_QUOT, _N_M_COMM_DOT_SLSH, KC_RSFT, \
-    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
+  [_QWERTY] = LAYOUT_wrapper(
+    KC_ESC,  _1_____2_____3_____4_____5,               _6_____7_____8_____9_____0,   KC_BSPC,
+    KC_TAB,   Q_____W_____E_____R_____T,                Y_____U_____I_____O_____P,   KC_BSLS,
+    KC_LCTL,  A_____S_____D_____F_____G,                H_____J_____K_____L____SCLN, KC_RCTL,
+    KC_LSFT,  Z_____X_____C_____V_____B,   GRV__QUOT,   N_____M____COMM__DOT___SLSH, KC_RSFT,
+     LOWER__LOWER__CAPS__LALT__LGUI__SPC__RABS, RAEN___SPC___RGUI__RALT__APP___LOWER__LOWER
    ),
 
-  /* Colemak
-   * ,-----------------------------------.           ,-----------------------------------.
+  /* Colemak */
+#define Q_____W_____F_____P_____G     KC_Q, KC_W, KC_F, KC_P, KC_G
+#define J_____L_____U_____Y____SCLN   KC_J, KC_L, KC_U, KC_Y, KC_SCLN
+#define A_____R_____S_____T_____D     KC_A, KC_R, KC_S, KC_T, KC_D
+#define H_____N_____E_____I_____O     KC_H, KC_N, KC_E, KC_I, KC_O
+#define Z_____X_____C_____V_____B     KC_Z, KC_X, KC_C, KC_V, KC_B
+#define K_____M____COMM__DOT___SLSH   KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH
+  /* ,-----------------------------------.           ,-----------------------------------.
    * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
    * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
    * | Tab |  Q  |  W  |  F  |  P  |  G  |           |  J  |  L  |  U  |  Y  |  ;  |  \  |
@@ -106,23 +109,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
    * `-----------------------------------------------------------------------------------'
    */
-#define _Q_W_F_P_G           KC_Q, KC_W, KC_F, KC_P, KC_G
-#define _J_L_U_Y_SCLN        KC_J, KC_L, KC_U, KC_Y, KC_SCLN
-#define _A_R_S_T_D           KC_A, KC_R, KC_S, KC_T, KC_D
-#define _H_N_E_I_O           KC_H, KC_N, KC_E, KC_I, KC_O
-#define _Z_X_C_V_B           KC_Z, KC_X, KC_C, KC_V, KC_B
-#define _K_M_COMM_DOT_SLSH   KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH
-
-  [_COLEMAK] = LAYOUT_wrapper( \
-    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,         KC_BSPC, \
-    KC_TAB,   _Q_W_F_P_G,                       _J_L_U_Y_SCLN,      KC_BSLS, \
-    KC_LCTL,  _A_R_S_T_D,                       _H_N_E_I_O,         KC_RCTL, \
-    KC_LSFT,  _Z_X_C_V_B,     KC_GRV,  KC_QUOT, _K_M_COMM_DOT_SLSH, KC_RSFT, \
-    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
-  ),
+  [_COLEMAK] = LAYOUT_wrapper(
+    KC_ESC,  _1_____2_____3_____4_____5,               _6_____7_____8_____9_____0,   KC_BSPC,
+    KC_TAB,   Q_____W_____F_____P_____G,                J_____L_____U_____Y____SCLN, KC_BSLS,
+    KC_LCTL,  A_____R_____S_____T_____D,                H_____N_____E_____I_____O,   KC_RCTL,
+    KC_LSFT,  Z_____X_____C_____V_____B,   GRV__QUOT,   K_____M____COMM__DOT___SLSH, KC_RSFT,
+     LOWER__LOWER__CAPS__LALT__LGUI__SPC__RABS, RAEN___SPC___RGUI__RALT__APP___LOWER__LOWER
+   ),
 
-  /* Dvorak
-   * ,-----------------------------------.           ,-----------------------------------.
+  /* Dvorak */
+#define QUOT_COMM___DOT____P_____Y   KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y
+#define  F_____G_____C_____R_____L   KC_F, KC_G, KC_C, KC_R, KC_L
+#define  A_____O_____E_____U_____I   KC_A, KC_O, KC_E, KC_U, KC_I
+#define  D_____H_____T_____N_____S   KC_D, KC_H, KC_T, KC_N, KC_S
+#define SCLN___Q_____J_____K_____X   KC_SCLN, KC_Q, KC_J, KC_K, KC_X
+#define  B_____M_____W_____V_____Z   KC_B, KC_M, KC_W, KC_V, KC_Z
+#define GRV__SLSH KC_GRV,  KC_SLSH
+  /* ,-----------------------------------.           ,-----------------------------------.
    * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
    * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
    * | Tab |  '  |  ,  |  .  |  P  |  Y  |           |  F  |  G  |  C  |  R  |  L  |  \  |
@@ -134,23 +137,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
    * `-----------------------------------------------------------------------------------'
    */
-#define _QUOT_COMM_DOT_P_Y   KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y
-#define _F_G_C_R_L           KC_F, KC_G, KC_C, KC_R, KC_L
-#define _A_O_E_U_I           KC_A, KC_O, KC_E, KC_U, KC_I
-#define _D_H_T_N_S           KC_D, KC_H, KC_T, KC_N, KC_S
-#define _SCLN_Q_J_K_X        KC_SCLN, KC_Q, KC_J, KC_K, KC_X
-#define _B_M_W_V_Z           KC_B, KC_M, KC_W, KC_V, KC_Z
-
-  [_DVORAK] = LAYOUT_wrapper( \
-    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,    KC_BSPC, \
-    KC_TAB,   _QUOT_COMM_DOT_P_Y,               _F_G_C_R_L,    KC_BSLS, \
-    KC_LCTL,  _A_O_E_U_I,                       _D_H_T_N_S,    KC_RCTL, \
-    KC_LSFT,  _SCLN_Q_J_K_X,  KC_GRV,  KC_SLSH, _B_M_W_V_Z,    KC_RSFT, \
-    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
+  [_DVORAK] = LAYOUT_wrapper(
+    KC_ESC,  _1_____2_____3_____4_____5,               _6_____7_____8_____9_____0,   KC_BSPC,
+    KC_TAB,  QUOT_COMM___DOT____P_____Y,                F_____G_____C_____R_____L,   KC_BSLS,
+    KC_LCTL,  A_____O_____E_____U_____I,                D_____H_____T_____N_____S,   KC_RCTL,
+    KC_LSFT, SCLN___Q_____J_____K_____X,   GRV__SLSH,   B_____M_____W_____V_____Z,   KC_RSFT,
+     LOWER__LOWER__CAPS__LALT__LGUI__SPC__RABS, RAEN___SPC___RGUI__RALT__APP___LOWER__LOWER
    ),
 
-  /* Eucalyn (http://eucalyn.hatenadiary.jp/entry/about-eucalyn-layout)
-   * ,-----------------------------------.           ,-----------------------------------.
+  /* Eucalyn (http://eucalyn.hatenadiary.jp/entry/about-eucalyn-layout) */
+#define Q_____W___COMM___DOT__SCLN   KC_Q, KC_W, KC_COMM, KC_DOT, KC_SCLN
+#define M_____R_____D_____Y_____P    KC_M, KC_R, KC_D, KC_Y, KC_P
+#define A_____O_____E_____I_____U    KC_A, KC_O, KC_E, KC_I, KC_U
+#define G_____T_____K_____S_____N    KC_G, KC_T, KC_K, KC_S, KC_N
+#define Z_____X_____C_____V_____F    KC_Z, KC_X, KC_C, KC_V, KC_F
+#define B_____H_____J_____L____SLSH  KC_B, KC_H, KC_J, KC_L, KC_SLSH
+  /* ,-----------------------------------.           ,-----------------------------------.
    * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
    * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
    * | Tab |  Q  |  W  |  ,  |  .  |  ;  |           |  M  |  R  |  D  |  Y  |  P  |  \  |
@@ -162,23 +164,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
    * `-----------------------------------------------------------------------------------'
    */
-#define _Q_W_COMM_DOT_SCLN   KC_Q, KC_W, KC_COMM, KC_DOT, KC_SCLN
-#define _M_R_D_Y_P           KC_M, KC_R, KC_D, KC_Y, KC_P
-#define _A_O_E_I_U           KC_A, KC_O, KC_E, KC_I, KC_U
-#define _G_T_K_S_N           KC_G, KC_T, KC_K, KC_S, KC_N
-#define _Z_X_C_V_F           KC_Z, KC_X, KC_C, KC_V, KC_F
-#define _B_H_J_L_SLSH        KC_B, KC_H, KC_J, KC_L, KC_SLSH
-
-  [_EUCALYN] = LAYOUT_wrapper( \
-    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,     KC_BSPC, \
-    KC_TAB,   _Q_W_COMM_DOT_SCLN,               _M_R_D_Y_P,     KC_BSLS, \
-    KC_LCTL,  _A_O_E_I_U,                       _G_T_K_S_N,     KC_RCTL, \
-    KC_LSFT,  _Z_X_C_V_F,     KC_GRV,  KC_QUOT, _B_H_J_L_SLSH,  KC_RSFT, \
-    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
-  ),
+  [_EUCALYN] = LAYOUT_wrapper(
+    KC_ESC,  _1_____2_____3_____4_____5,               _6_____7_____8_____9_____0,   KC_BSPC,
+    KC_TAB,   Q_____W___COMM___DOT__SCLN,               M_____R_____D_____Y_____P,   KC_BSLS,
+    KC_LCTL,  A_____O_____E_____I_____U,                G_____T_____K_____S_____N,   KC_RCTL,
+    KC_LSFT,  Z_____X_____C_____V_____F,   GRV__QUOT,   B_____H_____J_____L____SLSH, KC_RSFT,
+     LOWER__LOWER__CAPS__LALT__LGUI__SPC__RABS, RAEN___SPC___RGUI__RALT__APP___LOWER__LOWER
+   ),
 
-  /* Keypad
-   * ,-----------------------------------.           ,-----------------------------------.
+  /* Keypad */
+#define KP_TAB__PSLS_PAST  KC_TAB,  KC_PSLS, KC_PAST
+#define KP__7_____8_____9  KC_KP_7, KC_KP_8, KC_KP_9
+#define KP__4_____5_____6  KC_KP_4, KC_KP_5, KC_KP_6
+#define KP__1_____2_____3  KC_KP_1, KC_KP_2, KC_KP_3
+#define KP__0___COMM_PDOT  KC_KP_0, KC_COMM, KC_PDOT
+#define F1___F6  KC_F1, KC_F6
+#define F2___F7  KC_F2, KC_F7
+#define F3___F8  KC_F3, KC_F8
+#define F4___F9  KC_F4, KC_F9
+#define F5__F10  KC_F5, KC_F10
+#define FF12   LT(_PADFUNC,KC_F12)
+  /* ,-----------------------------------.           ,-----------------------------------.
    * | Tab |  /  |  *  | Del |  F1 |  F6 |           |  F1 |  F6 | Del | Tab |  /  |  *  |
    * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
    * |  7  |  8  |  9  | BS  |  F2 |  F7 |           |  F2 |  F7 | BS  |  7  |  8  |  9  |
@@ -190,25 +196,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |  0  |  ,  |  .  |Enter|  F5 |  F10| F12 | F12 |  F5 |  F10|Enter|  0  |  ,  |  .  |
    * `-----------------------------------------------------------------------------------'
    */
-#define KP_TOP KC_TAB,  KC_PSLS, KC_PAST
-#define KP_789 KC_KP_7, KC_KP_8, KC_KP_9
-#define KP_456 KC_KP_4, KC_KP_5, KC_KP_6
-#define KP_123 KC_KP_1, KC_KP_2, KC_KP_3
-#define KP_BTM KC_KP_0, KC_COMM, KC_PDOT
-#define F_1_6  KC_F1, KC_F6
-#define F_2_7  KC_F2, KC_F7
-#define F_3_8  KC_F3, KC_F8
-#define F_4_9  KC_F4, KC_F9
-#define F_510  KC_F5, KC_F10
-#define FF12   LT(_PADFUNC,KC_F12)
-
-  [_KEYPAD] = LAYOUT_wrapper( \
-    KP_TOP, KC_DEL,  F_1_6,                     F_1_6,  KC_DEL, KP_TOP, \
-    KP_789, KC_BSPC, F_2_7,                     F_2_7, KC_BSPC, KP_789, \
-    KP_456, KC_PMNS, F_3_8,                     F_3_8, KC_PMNS, KP_456, \
-    KP_123, KC_PPLS, F_4_9,  KC_F11,  KC_F11,  F_4_9, KC_PPLS, KP_123, \
-    KP_BTM, KC_PENT, F_510,    FF12,    FF12,  F_510, KC_PENT, KP_BTM  \
-  ),
+  [_KEYPAD] = LAYOUT_wrapper(
+    KP_TAB__PSLS_PAST, KC_DEL,  F1___F6,                F1___F6, KC_DEL,  KP_TAB__PSLS_PAST,
+    KP__7_____8_____9, KC_BSPC, F2___F7,                F2___F7, KC_BSPC, KP__7_____8_____9,
+    KP__4_____5_____6, KC_PMNS, F3___F8,                F3___F8, KC_PMNS, KP__4_____5_____6,
+    KP__1_____2_____3, KC_PPLS, F4___F9, KC_F11,KC_F11, F4___F9, KC_PPLS, KP__1_____2_____3,
+    KP__0___COMM_PDOT, KC_PENT, F5__F10,   FF12,  FF12, F5__F10, KC_PENT, KP__0___COMM_PDOT
+   ),
 
   /*  AUX modifier key layer
    * ,-----------------------------------.           ,-----------------------------------.
@@ -223,16 +217,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |     | 00  |     |     |     |     |     |     |     |     |     |     | 00  |     |
    * `-----------------------------------------------------------------------------------'
    */
-  [_KAUX] = LAYOUT( \
-      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
-      ____,ZERO2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,ZERO2, ____ \
+  [_KAUX] = LAYOUT(
+      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____,
+      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____,
+      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____,
+      ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
+      ____,ZERO2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,ZERO2, ____
    ),
 
-  /*  Keypad function layer
-   * ,-----------------------------------------.             ,-----------------------------------------.
+  /*  Keypad function layer */
+#define PAUS__SLCK__PSCR              KC_PAUS, KC_SLCK, KC_PSCR
+#define PSCR__SLCK__PAUS              KC_PSCR, KC_SLCK, KC_PAUS
+#define HOME___UP___PGUP              KC_HOME, KC_UP,   KC_PGUP
+#define PGUP___UP___HOME              KC_PGUP, KC_UP,   KC_HOME
+#define DEL____INS__LEFT__DOWN__RGHT  KC_DEL,  KC_INS,  KC_LEFT, KC_DOWN, KC_RGHT
+#define LEFT__DOWN__RGHT___INS___DEL  KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL
+#define PGDN___ADJ___ADJ__PGDN        KC_PGDN, KC_ADJ,  KC_ADJ,  KC_PGDN
+  /* ,-----------------------------------------.             ,-----------------------------------------.
    * |      |      |      | Pause| ScrLk| PtrSc|             | PtrSc| ScrLk| Pause|      |      |      |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
    * |      |      |      | Home |  Up  | PgUp |             | PgUp |  Up  | Home |      |      |      |
@@ -244,55 +245,53 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-#define _PAUS_SLCK_PSCR           KC_PAUS, KC_SLCK, KC_PSCR
-#define _PSCR_SLCK_PAUS           KC_PSCR, KC_SLCK, KC_PAUS
-#define _HOME_UP_PGUP             KC_HOME, KC_UP,   KC_PGUP
-#define _PGUP_UP_HOME             KC_PGUP, KC_UP,   KC_HOME
-#define _DEL_INS_LEFT_DOWN_RGHT   KC_DEL,  KC_INS,  KC_LEFT, KC_DOWN, KC_RGHT
-#define _LEFT_DOWN_RGHT_INS_DEL   KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL
-#define _PGDN_ADJ_ADJ_PGDN        KC_PGDN, KC_ADJ,  KC_ADJ,  KC_PGDN
-
-  [_PADFUNC] = LAYOUT_wrapper( \
-      XXXX, XXXX, XXXX, _PAUS_SLCK_PSCR,               _PSCR_SLCK_PAUS,       XXXX, XXXX, XXXX, \
-      XXXX, XXXX, XXXX,   _HOME_UP_PGUP,               _PGUP_UP_HOME,         XXXX, XXXX, XXXX, \
-      XXXX,     _DEL_INS_LEFT_DOWN_RGHT,               _LEFT_DOWN_RGHT_INS_DEL,           XXXX, \
-      XXXX, XXXX, XXXX, KC_END, XXXX,   _PGDN_ADJ_ADJ_PGDN,     XXXX, KC_END, XXXX, XXXX, XXXX, \
-      XXXX, XXXX, XXXX, XXXX,   XXXX, XXXX, ____, ____,   XXXX, XXXX,   XXXX, XXXX, XXXX, XXXX \
+  [_PADFUNC] = LAYOUT_wrapper(
+    XXXX, XXXX, XXXX, PAUS__SLCK__PSCR,             PSCR__SLCK__PAUS, XXXX, XXXX, XXXX,
+    XXXX, XXXX, XXXX, HOME___UP___PGUP,             PGUP___UP___HOME, XXXX, XXXX, XXXX,
+    XXXX, DEL____INS__LEFT__DOWN__RGHT,             LEFT__DOWN__RGHT___INS___DEL, XXXX,
+    XXXX, XXXX, XXXX,KC_END,XXXX, PGDN___ADJ___ADJ__PGDN, XXXX,KC_END,XXXX, XXXX, XXXX,
+    XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, ____, ____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX
    ),
 
-  /* Lower
-   * ,-----------------------------------------.             ,-----------------------------------------.
+  /* Lower */
+#define F1____F2____F3____F4____F5     KC_F1, KC_F2, KC_F3, KC_F4, KC_F5
+#define F6____F7____F8____F9____F10    KC_F6, KC_F7, KC_F8, KC_F9, KC_F10
+#define XXXX__PAUS__SLCK___INS         XXXX, KC_PAUS, KC_SLCK, KC_INS
+#define XXXX___INS__SLCK__PAUS__XXXX   XXXX, KC_INS,  KC_SLCK, KC_PAUS, XXXX
+#define ADJ___ADJ                      KC_ADJ,  KC_ADJ
+#define HOME__XXXX___UP____DEL__PGUP   KC_HOME, XXXX, KC_UP, KC_DEL, KC_PGUP
+#define PGUP___DEL___UP___XXXX__HOME   KC_PGUP, KC_DEL,  KC_UP, XXXX, KC_HOME
+#define END__LEFT__DOWN__RGHT__PGDN    KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN
+#define PGDN__LEFT__DOWN__RGHT___END   KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_END
+  /* ,-----------------------------------------.             ,-----------------------------------------.
    * |      |  F1  |  F2  |  F3  |  F4  |  F5  |             |  F6  |  F7  |  F8  |  F9  |  F10 | F11  |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
    * |      |      |Pause | ScrLk| Ins  |      |             |      | Ins  | ScrLk|Pause |      | F12  |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      | PgUp |      | Up   |Delete| Home |             | Home |Delete| Up   |      | PgUp |      |
+   * |      | Home |      | Up   |Delete| PgUp |             | PgUp |Delete| Up   |      | Home |      |
    * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | PgDn | Left | Down | Right| End  |Adjust|Adjust| End  | Left | Down | Right| PgDn |      |
+   * |      | End  | Left | Down | Right| PgDn |Adjust|Adjust| PgDn | Left | Down | Right| End  |      |
    * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
    * |      |      | PrtSc|      |      |      |      |      |      |      |      | PrtSc|      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-#define _F1_F2_F3_F4_F5           KC_F1, KC_F2, KC_F3, KC_F4, KC_F5
-#define _F6_F7_F8_F9_F10_F11      KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11
-#define _PAUS_SLCK_INS            KC_PAUS, KC_SLCK, KC_INS
-#define _INS_SLCK_PAUS            KC_INS,  KC_SLCK, KC_PAUS
-#define _ADJ_ADJ                  KC_ADJ,  KC_ADJ
-#define _UP_DEL_PGUP              KC_UP,   KC_DEL,  KC_PGUP
-#define _PGUP_DEL_UP              KC_PGUP, KC_DEL,  KC_UP
-#define _END_LEFT_DOWN_RGHT_PGDN  KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN
-#define _PGDN_LEFT_DOWN_RGHT_END  KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_END
-
-  [_LOWER] = LAYOUT_wrapper( \
-      XXXX, _F1_F2_F3_F4_F5,                             _F6_F7_F8_F9_F10_F11, \
-      XXXX, XXXX,    _PAUS_SLCK_INS,   XXXX,             XXXX,  _INS_SLCK_PAUS,    XXXX, KC_F12, \
-      ____, KC_HOME, XXXX, _UP_DEL_PGUP,                 _PGUP_DEL_UP,      XXXX, KC_HOME, ____, \
-      ____, _END_LEFT_DOWN_RGHT_PGDN,        XXXX, XXXX, _PGDN_LEFT_DOWN_RGHT_END,         ____, \
-      ____, ____, KC_PSCR, ____, ____, ____,  _ADJ_ADJ,  ____, ____, ____, KC_PSCR, ____, ____ \
-      ),
+  [_LOWER] = LAYOUT_wrapper(
+    XXXX,  F1____F2____F3____F4____F5,               F6____F7____F8____F9____F10, KC_F11,
+    XXXX, XXXX__PAUS__SLCK___INS, XXXX,             XXXX___INS__SLCK__PAUS__XXXX, KC_F12,
+    ____, HOME__XXXX___UP____DEL__PGUP,             PGUP___DEL___UP___XXXX__HOME,  ____,
+    ____,  END__LEFT__DOWN__RGHT__PGDN, XXXX, XXXX, PGDN__LEFT__DOWN__RGHT___END,  ____,
+    ____, ____,KC_PSCR,____, ____, ____, ADJ___ADJ, ____, ____, ____,KC_PSCR,____, ____
+   ),
 
-  /* Raise
-   * ,-----------------------------------------.             ,-----------------------------------------.
+  /* Raise */
+#define UNDS__MINS             KC_UNDS, KC_MINS
+#define EQL___PLUS             KC_EQL,  KC_PLUS
+#define LCBR__LBRC             KC_LCBR, KC_LBRC
+#define RBRC__RCBR             KC_RBRC, KC_RCBR
+#define MNXT__VOLD__VOLU__MPLY KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+#define EISU__EISU             xEISU, xEISU
+#define KANA__KANA             xKANA, xKANA
+  /* ,-----------------------------------------.             ,-----------------------------------------.
    * |      |      |      |      |      |      |             |      |      |      |      |      |      |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
    * |      |      |      |      |  _   |  -   |             |  =   |  +   |      |      |      |      |
@@ -304,19 +303,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-#define _LSMI_MINS             KC_LSMI, KC_MINS
-#define _EQL_LSEQ              KC_EQL,  KC_LSEQ
-#define _LSLB_LBRC             KC_LSLB, KC_LBRC
-#define _RBRC_LSRB             KC_RBRC, KC_LSRB
-#define _MNXT_VOLD_VOLU_MPLY   KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-
-  [_RAISE] = LAYOUT_wrapper( \
-      XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,             XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, \
-      XXXX, XXXX, XXXX, XXXX, _LSMI_MINS,             _EQL_LSEQ,  XXXX, XXXX, XXXX, XXXX, \
-      ____, XXXX, XXXX, XXXX, _LSLB_LBRC,             _RBRC_LSRB, XXXX, XXXX, XXXX, ____, \
-      ____, XXXX, XXXX, XXXX, XXXX,xEISU,xEISU, xKANA,xKANA, _MNXT_VOLD_VOLU_MPLY,  ____, \
-      _ADJ_ADJ,   XXXX, ____, ____, XXXX, ____, ____, XXXX, ____, ____, XXXX,   _ADJ_ADJ \
-      ),
+  [_RAISE] = LAYOUT_wrapper(
+    XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,             XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,
+    XXXX, XXXX, XXXX, XXXX, UNDS__MINS,             EQL___PLUS, XXXX, XXXX, XXXX, XXXX,
+    ____, XXXX, XXXX, XXXX, LCBR__LBRC,             RBRC__RCBR, XXXX, XXXX, XXXX, ____,
+    ____, XXXX, XXXX, XXXX, XXXX, EISU__EISU, KANA__KANA, MNXT__VOLD__VOLU__MPLY, ____,
+     ADJ___ADJ, XXXX, ____, ____, XXXX, ____, ____, XXXX, ____, ____, XXXX,  ADJ___ADJ
+   ),
 
   /* Adjust (Lower + Raise)
    * ,-----------------------------------------.             ,-----------------------------------------.
@@ -331,16 +324,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-  [_ADJUST] =  LAYOUT( \
-      XXXXXXX, KEYPAD,  DVORAK,  COLEMAK, EUCALYN,  QWERTY,          QWERTY,  EUCALYN, COLEMAK,  DVORAK,  KEYPAD, XXXXXXX, \
-      XXXXXXX, RESET,   RGBRST,  RGB_TOG,   AU_ON, AG_SWAP,          AG_SWAP,   AU_ON, RGB_TOG,  RGBRST, XXXXXXX, XXXXXXX, \
-      RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  AU_OFF, AG_NORM,          AG_NORM,  AU_OFF, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, \
-      RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, \
-      _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______ \
+  [_ADJUST] =  LAYOUT(
+      XXXXXXX, KEYPAD,  DVORAK,  COLEMAK, EUCALYN,  QWERTY,          QWERTY,  EUCALYN, COLEMAK,  DVORAK,  KEYPAD, XXXXXXX,
+      XXXXXXX, RESET,   RGBRST,  RGB_TOG,   AU_ON, AG_SWAP,          AG_SWAP,   AU_ON, RGB_TOG,  RGBRST, XXXXXXX, XXXXXXX,
+      RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  AU_OFF, AG_NORM,          AG_NORM,  AU_OFF, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI,
+      RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD,
+      _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______
    ),
 
-  /*  AUX modifier key layer
-   * ,-----------------------------------------.             ,-----------------------------------------.
+  /*  AUX modifier key layer */
+#define BSPC__RAEN KC_BSPC, LT(_RAISE,KC_ENT)
+  /* ,-----------------------------------------.             ,-----------------------------------------.
    * |      |      |      |      |      |      |             |      |      |      |      |      |      |
    * |------+------+------+------+------+------|             |------+------+------+------+------+------|
    * |      |      |      |      |      |      |             |      |      |      |      |      |      |
@@ -352,14 +346,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |      |      |      |      |      |  BS  | Enter|      |      |      |      |      |      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-#define _BSPC_RAEN KC_BSPC, LT(_RAISE,KC_ENT)
-  [_AUX] = LAYOUT_wrapper( \
-      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, _BSPC_RAEN, ____, ____, ____, ____, ____, ____, ____ \
-      )
+  [_AUX] = LAYOUT_wrapper(
+    ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____,
+    ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____,
+    ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____,
+    ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
+    ____, ____, ____, ____, ____, BSPC__RAEN, ____, ____, ____, ____, ____, ____, ____
+   )
 };
 
 #else
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
index 127d80cc7d..689efe4c88 100644
--- a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
+++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
@@ -163,6 +163,10 @@ void render_status(void) {
 }
 
 #    ifdef SSD1306OLED
+#        if OLED_UPDATE_INTERVAL > 0
+uint16_t oled_update_timeout;
+#        endif
+
 void iota_gfx_task_user(void) {
     struct CharacterMatrix matrix;
 
@@ -172,6 +176,12 @@ void iota_gfx_task_user(void) {
     }
 #        endif
 
+#if      OLED_UPDATE_INTERVAL > 0
+    if (timer_elapsed(oled_update_timeout) < OLED_UPDATE_INTERVAL) {
+        return;
+    }
+    oled_update_timeout = timer_read();
+#endif
     matrix_clear(&matrix);
     if (is_keyboard_master()) {
         render_status(&matrix);