GH60: readme cleanup, Refactor, and Configurator update (#3164)

* Readme cleanup

* Refactor

* Configurator updates

* Removed an extra comma

* Add supported PCB revisions

* Refactor: remove matrix aliases

10 files changed, 270 insertions, 267 deletions

diff --git a/keyboards/gh60/keymaps/bluezio/keymap.c b/keyboards/gh60/keymaps/bluezio/keymap.c
index ab8909f47d..7b2f16fada 100644
--- a/keyboards/gh60/keymaps/bluezio/keymap.c
+++ b/keyboards/gh60/keymaps/bluezio/keymap.c
@@ -1,5 +1,4 @@
-#include "gh60.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
 
 // lshift split, backspace split, full ANSI enter, full right shift
 #define KEYMAP_BZIO(                                                         \
diff --git a/keyboards/gh60/keymaps/chaser/keymap.c b/keyboards/gh60/keymaps/chaser/keymap.c
index cc32859161..bff29428bb 100644
--- a/keyboards/gh60/keymaps/chaser/keymap.c
+++ b/keyboards/gh60/keymaps/chaser/keymap.c
@@ -1,6 +1,4 @@
 #include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "eeconfig.h"
 #include <util/delay.h>
 
 
@@ -37,106 +35,109 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-/*
- * ,-----------------------------------------------------------.
- * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
- * |-----------------------------------------------------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
- * |-----------------------------------------------------------|
- * |FN     |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
- * |-----------------------------------------------------------|
- * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  Up  |FN |
- * |-----------------------------------------------------------|
- * |Ctrl|Gui |Alt |      Space           |Alt |Left |Down|Right|
- * `-----------------------------------------------------------'
- *
- * Note: right FN triggers function layer,
- *       left FN is a one-shot button for the macro layer
- */
-[_QW] = { /* Layer 0: Qwerty */
-    {KC_ESC  , KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC},
-    {KC_TAB  , KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS},
-    {OSL(_MC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT },
-    {KC_LSFT , XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, F_BTN, KC_UP},
-    {KC_LCTL , KC_LGUI, KC_LALT, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT}
-},\
+  /*
+   * ,-----------------------------------------------------------.
+   * |Esc~| 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
+   * |-----------------------------------------------------------|
+   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
+   * |-----------------------------------------------------------|
+   * |FN     |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+   * |-----------------------------------------------------------|
+   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  FN  |Up |
+   * |-----------------------------------------------------------|
+   * |Ctrl|Gui |Alt |      Space           |Alt |Left |Down|Right|
+   * `-----------------------------------------------------------'
+   *
+   * Note: right FN triggers function layer,
+   *       left FN is a one-shot button for the macro layer
+   */
+  /* Layer 0: Qwerty */
+  [_QW] = LAYOUT_60_ansi_split_rshift( \
+    KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
+    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, \
+    OSL(_MC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  \
+    KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          F_BTN,   KC_UP,   \
+    KC_LCTL,  KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT  \
+  ),
 
-/*
- * ,-----------------------------------------------------------.
- * |GRV|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|   DEL |
- * |-----------------------------------------------------------|
- * |  MB3|MB2|MUP|MB1|MWU|   |   |   |INS|   |RST|   |   |Print|
- * |-----------------------------------------------------------|
- * |      | ML|MDN|MR |MWD|   |   |       |   |   |   |        |
- * |-----------------------------------------------------------|
- * |CAPS    |   |   |   |   |   |   |   |   |   |   |PGUP|     |
- * |-----------------------------------------------------------|
- * |    |    |    |                        |Ctrl|HOME|PGD |END |
- * `-----------------------------------------------------------'
- */
-[_FL] = { /* Layer 1: Functions */
-    {KC_GRV     , 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_DEL },
-    {KC_MS_BTN3 , KC_MS_BTN2 ,KC_MS_UP   ,KC_MS_BTN1 , KC_MS_WH_UP  , _______, _______, _______, KC_INS , _______, RESET   , _______, _______  , KC_PSCREEN},
-    {KC_CAPS    , KC_MS_LEFT ,KC_MS_DOWN ,KC_MS_RIGHT, KC_MS_WH_DOWN, _______, _______, _______, _______, _______, _______ , XXXXXXX, KC_TILDE},
-    {_______    , XXXXXXX    , _______   , _______   , _______      , _______, _______, _______, _______, _______, _______ , _______, _______  , KC_PGUP},
-    {_______    , _______    , _______   , XXXXXXX   , XXXXXXX      , _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RCTRL, KC_HOME, KC_PGDOWN, KC_END}
-},
+  /*
+   * ,-----------------------------------------------------------.
+   * |GRV|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|   DEL |
+   * |-----------------------------------------------------------|
+   * |  MB3|MB2|MUP|MB1|MWU|   |   |   |INS|   |RST|   |   |Print|
+   * |-----------------------------------------------------------|
+   * |      | ML|MDN|MR |MWD|   |   |       |   |   |   |        |
+   * |-----------------------------------------------------------|
+   * |CAPS    |   |   |   |   |   |   |   |   |   |   |PGUP|     |
+   * |-----------------------------------------------------------|
+   * |    |    |    |                        |Ctrl|HOME|PGD |END |
+   * `-----------------------------------------------------------'
+   */
+  /* Layer 1: Functions */
+  [_FL] = LAYOUT_60_ansi_split_rshift(
+    KC_GRV,  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_DEL,  \
+    KC_BTN3, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, _______, _______, _______, KC_INS,  _______, RESET,   _______, _______, KC_PSCR, \
+    KC_CAPS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, _______, _______, _______, _______, _______,          KC_TILD, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP, \
+    _______, _______, _______,                   _______,                                     KC_RCTL, KC_HOME, KC_PGDN, KC_END   \
+  ),
 
-/*
- * ,-----------------------------------------------------------.
- * |DEF|   |DUE|   |   |   |   |   |   |   |   |   |GAM|    ARR|
- * |-----------------------------------------------------------|
- * |     |MAG|CLO|DUT|RBS|TIG|MRT|   |   |COU|PSH|   |   |     |
- * |-----------------------------------------------------------|
- * |      |ADD|STS|DFF|FTC|PLL|MRG|   |STH|LOG|   |   |   F_OFF|
- * |-----------------------------------------------------------|
- * |         |   |   |COM|   |BRN|   |   |   |   |MUT|VOL+|PLPA|
- * |-----------------------------------------------------------|
- * |    |    |    |                        |APP |PREV|VOL-|NEXT|
- * `-----------------------------------------------------------'
- *
- * Abbreviations:
- * --------------
- * DEF  - return to default layer
- * DUE  - enable git duet mode
- * CLO  - git clone
- * DUT  - git duet (when in duet mode)
- * RBS  - git rebase
- * MAG  - git submodule sync --recursive && git submodule update --init --recursive && git submodule foreach --recursive "git co . && git reset --hard && git clean -dffx"
- * TIG  - tig
- * MRG  - git merge
- * MRT  - git mergetool
- * COU  - git checkout
- * PSH  - git push
- * ADD  - git add
- * STS  - git status
- * DFF  - git diff
- * FTC  - git fetch
- * PLL  - git pull
- * STH  - git stash
- * LOG  - git log
- * COM  - git commit (or git duet commit if in duet mode)
- * BRN  - git branch
- * APP  - application (windows menu key)
- * MUT  - audio mute
- * VOL+ - increase volume
- * VOL- - decrease volume
- * PLPA - play/pause
- * PREV - previous song
- * NEXT - next song
- * ARR  - backlight arrow keys
- * GAM  - backlight WASD
- *
- * Note: git commands are SEND_STRING macros sent to the
- *       currently focused window Make sure it is your terminal :)
- */
-[_MC] = { /* Layer 2: Macros (Git & Multimedia) */
-    {TO(_QW), XXXXXXX,G_DUE  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX , XXXXXXX, K_WASD , K_ARR },
-    {XXXXXXX, G_MAG  ,G_CLO  , G_DUT  , G_RBS  , G_TIG  , G_MRT  , XXXXXXX, XXXXXXX, G_COU  , G_PSH   , XXXXXXX, XXXXXXX, XXXXXXX},
-    {XXXXXXX, G_ADD  ,G_STS  , G_DFF  , G_FTC  , G_PLL  , G_MRG  , XXXXXXX, G_STH  , G_LOG  , XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX},
-    {XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, G_COM  , XXXXXXX, G_BRN  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX , A_MUTE, A_PLPA, A_VOUP},
-    {XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, M_WAPP  , A_PREV, A_VDWN, A_NEXT}
-},
+  /*
+   * ,-----------------------------------------------------------.
+   * |DEF|   |DUE|   |   |   |   |   |   |   |   |   |GAM|    ARR|
+   * |-----------------------------------------------------------|
+   * |     |MAG|CLO|DUT|RBS|TIG|MRT|   |   |COU|PSH|   |   |     |
+   * |-----------------------------------------------------------|
+   * |      |ADD|STS|DFF|FTC|PLL|MRG|   |STH|LOG|   |   |   F_OFF|
+   * |-----------------------------------------------------------|
+   * |         |   |   |COM|   |BRN|   |   |   |   |MUT|VOL+|PLPA|
+   * |-----------------------------------------------------------|
+   * |    |    |    |                        |APP |PREV|VOL-|NEXT|
+   * `-----------------------------------------------------------'
+   *
+   * Abbreviations:
+   * --------------
+   * DEF  - return to default layer
+   * DUE  - enable git duet mode
+   * CLO  - git clone
+   * DUT  - git duet (when in duet mode)
+   * RBS  - git rebase
+   * MAG  - git submodule sync --recursive && git submodule update --init --recursive && git submodule foreach --recursive "git co . && git reset --hard && git clean -dffx"
+   * TIG  - tig
+   * MRG  - git merge
+   * MRT  - git mergetool
+   * COU  - git checkout
+   * PSH  - git push
+   * ADD  - git add
+   * STS  - git status
+   * DFF  - git diff
+   * FTC  - git fetch
+   * PLL  - git pull
+   * STH  - git stash
+   * LOG  - git log
+   * COM  - git commit (or git duet commit if in duet mode)
+   * BRN  - git branch
+   * APP  - application (windows menu key)
+   * MUT  - audio mute
+   * VOL+ - increase volume
+   * VOL- - decrease volume
+   * PLPA - play/pause
+   * PREV - previous song
+   * NEXT - next song
+   * ARR  - backlight arrow keys
+   * GAM  - backlight WASD
+   *
+   * Note: git commands are SEND_STRING macros sent to the
+   *       currently focused window Make sure it is your terminal :)
+   */
+  /* Layer 2: Macros (Git & Multimedia) */
+  [_MC] = LAYOUT_60_ansi_split_rshift( \
+    TO(_QW), XXXXXXX, G_DUE,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, K_WASD,  K_ARR,   \
+    XXXXXXX, G_MAG,   G_CLO,   G_DUT,   G_RBS,   G_TIG,   G_MRT,   XXXXXXX, XXXXXXX, G_COU,   G_PSH,   XXXXXXX, XXXXXXX, XXXXXXX, \
+    XXXXXXX, G_ADD,   G_STS,   G_DFF,   G_FTC,   G_PLL,   G_MRG,   XXXXXXX, G_STH,   G_LOG,   XXXXXXX, XXXXXXX,          XXXXXXX, \
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, G_COM,   XXXXXXX, G_BRN,   XXXXXXX, XXXXXXX, XXXXXXX, A_MUTE,           A_PLPA,  A_VOUP,  \
+    XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,                                     M_WAPP,  A_PREV,  A_VDWN,  A_NEXT   \
+  ),
 
 };
 
diff --git a/keyboards/gh60/keymaps/dbroqua/keymap.c b/keyboards/gh60/keymaps/dbroqua/keymap.c
index be88edc090..2030355a76 100644
--- a/keyboards/gh60/keymaps/dbroqua/keymap.c
+++ b/keyboards/gh60/keymaps/dbroqua/keymap.c
@@ -1,6 +1,4 @@
-#include "gh60.h"
-#include "action_layer.h"
-#include "rgblight.h"
+#include QMK_KEYBOARD_H
 
 #define _DEFAULT 0
 #define _FN 1
@@ -30,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *         |LGUI | LAlt  |               Space                | RAlt   |RGUI |
  *         `-----------------------------------------------------------------'
  */
-  [_DEFAULT] = KEYMAP_HHKB( /* Basic QWERTY */
+  [_DEFAULT] = LAYOUT_60_ansi_split_bs_rshift( /* Basic QWERTY */
       KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5,   KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, \
       KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,  \
       KC_LCTL, KC_A,    KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  \
@@ -51,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *         |       |       |                                 | Stop  |       |
  *         `-----------------------------------------------------------------'
  */
-  [_FN] = KEYMAP_HHKB( /* Layer 1 */
+  [_FN] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 1 */
       TG(_SFX),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_INS,  KC_DEL, \
       KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,  ______, ______,  \
       ______,  KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,______,   \
@@ -72,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *         |       |       |                                 |       |       |
  *         `-----------------------------------------------------------------'
  */
-  [_WASD] = KEYMAP_HHKB( /* Layer 2 */
+  [_WASD] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 2 */
       ______,   ______,  ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  ______, \
       ______,   ______,  KC_UP,  ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
       ______,   KC_LEFT, KC_DOWN,KC_RGHT,______, ______, ______, ______, ______, ______, ______, ______, ______,   \
@@ -93,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *         |       |       |                                 |       |       |
  *         `-----------------------------------------------------------------'
  */
-  [_SFX] = KEYMAP_HHKB(
+  [_SFX] = LAYOUT_60_ansi_split_bs_rshift(
       ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
       ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \
       ______,   F(0),   F(1),   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,   \
diff --git a/keyboards/gh60/keymaps/dbroqua_7U/keymap.c b/keyboards/gh60/keymaps/dbroqua_7U/keymap.c
index bebfe5af5d..74ff97a931 100644
--- a/keyboards/gh60/keymaps/dbroqua_7U/keymap.c
+++ b/keyboards/gh60/keymaps/dbroqua_7U/keymap.c
@@ -1,5 +1,4 @@
-#include "gh60.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
 
 #define _DEFAULT 0
 #define _FN 1
@@ -23,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *         |LGUI | LAlt  |               Space                | RAlt   |RGUI |
  *         `-----------------------------------------------------------------'
  */
-  [_DEFAULT] = KEYMAP_HHKB( /* Basic QWERTY */
+  [_DEFAULT] = LAYOUT_60_ansi_split_bs_rshift( /* Basic QWERTY */
       KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5,   KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, \
       KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,  \
       KC_LCTL, KC_A,    KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  \
@@ -44,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *         |       |       |                                 | Stop  |       |
  *         `-----------------------------------------------------------------'
  */
-  [_FN] = KEYMAP_HHKB( /* Layer 1 */
+  [_FN] = LAYOUT_60_ansi_split_bs_rshift( /* Layer 1 */
       F(0),   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_INS,  KC_DEL, \
       KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,  ______, ______,  \
       ______,  KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,______,   \
diff --git a/keyboards/gh60/keymaps/default/keymap.c b/keyboards/gh60/keymaps/default/keymap.c
index 92f5459840..f8ca9a35c0 100644
--- a/keyboards/gh60/keymaps/default/keymap.c
+++ b/keyboards/gh60/keymaps/default/keymap.c
@@ -1,28 +1,36 @@
-#include "gh60.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
+
+// Fillers to make layering more clear
+#define _______ KC_TRNS
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* 0: qwerty */
-    KEYMAP(
-	      KC_ESC,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_GRV,\
-        KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSPC,\
-        KC_CAPS,KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT,KC_NO,KC_ENT,\
-        KC_LSFT,F(1),KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,F(0),KC_RSFT,\
-        KC_LCTL,KC_LGUI,KC_LALT,       KC_SPC,             KC_BSLS,KC_RALT,KC_RGUI,KC_APP,KC_RCTL),
-    /* 1: fn */
-	KEYMAP(
-        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_TRNS,\
-        KC_TRNS,KC_TRNS,KC_UP,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,\
-        KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,\
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,\
-        KC_TRNS,KC_TRNS,KC_TRNS,       KC_TRNS,            KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS),
+
+  /* 0: qwerty */
+  LAYOUT(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NO,   KC_ENT,
+    KC_LSFT, F(1),    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, F(0),    KC_RSFT,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_BSLS, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
+  ),
+  /* 1: fn */
+  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_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
+  ),
+
     /* 2: arrows */
-	KEYMAP(
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,\
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,\
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,\
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_UP,\
-        KC_TRNS,KC_TRNS,KC_TRNS,       KC_TRNS,            KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT),
+  LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,
+    _______, _______, _______,                   _______,                            _______, _______, KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
 };
 
 const uint16_t PROGMEM fn_actions[] = {
diff --git a/keyboards/gh60/keymaps/maartenwut/keymap.c b/keyboards/gh60/keymaps/maartenwut/keymap.c
index 825a403367..d5e101e7f6 100755
--- a/keyboards/gh60/keymaps/maartenwut/keymap.c
+++ b/keyboards/gh60/keymaps/maartenwut/keymap.c
@@ -1,5 +1,4 @@
-#include "gh60.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
 
 #define _MA 0
 #define _GA 1
@@ -14,34 +13,35 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Main Layer
-[_MA] = KEYMAP_HHKB(
-	KC_GESC,	KC_1, 		KC_2, 		KC_3, 		KC_4, 		KC_5, 		KC_6, 		KC_7, 		KC_8, 		KC_9, 		KC_0, 		KC_MINS,	KC_EQL,		KC_BSPC,	KC_NO,
-	KC_TAB,		KC_Q, 		KC_W, 		KC_E, 		KC_R, 		KC_T, 		KC_Y, 		KC_U, 		KC_I,  		KC_O,  		KC_P, 		KC_LBRC,	KC_RBRC,	KC_BSLS,
-	KC_CAPS,	KC_A, 		KC_S,   	KC_D, 		KC_F, 		KC_G, 		KC_H, 		KC_J, 		KC_K,  		KC_L,  		KC_SCLN, 	KC_QUOT,  				KC_ENT,
-	LSHIFT, 				KC_Z, 		KC_X,   	KC_C, 		KC_V, 		KC_B, 		KC_N, 		KC_M, 		KC_COMM, 	KC_DOT,		KC_SLSH,	KC_RSFT, 	KC_DEL,
-	KC_LCTL, 	KC_LGUI, 	KC_LALT,										SPACE,											KC_NO,		KC_RALT, 	MO(_FL), 	KC_RCTRL),
+[_MA] = LAYOUT_60_ansi_split_bs_rshift(
+  KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NO,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
+  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,          KC_ENT,
+  LSHIFT,         KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_DEL,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                    SPACE,                      KC_NO,    KC_RALT,  MO(_FL),  KC_RCTRL),
 
 //Function Layer
-[_FL] = KEYMAP_HHKB(
-	KC_GRV,		KC_F1,		KC_F2,  	KC_F3,  	KC_F4,  	KC_F5,		KC_F6,		KC_F7, 		KC_F8,		KC_F9,		KC_F10,  	KC_F11,		KC_F12,		RESET,		KC_NO,
-	TRNS, 		TRNS,		TRNS,  		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS,		KC_PSCR,
-	TRNS, 		KC_MS_L,	KC_MS_D, 	KC_MS_R,	TRNS,		TG(_GA),	TRNS,		TRNS,		TRNS,		TRNS,		TRNS,		TRNS,					TRNS,
-	TRNS, 					TRNS,		TRNS,		TRNS,	 	TRNS, 		TRNS, 		TRNS,		TRNS,		KC_VOLD,	KC_VOLU,	KC_MUTE,	TRNS,		KC_MPLY,
-	TRNS, 		TRNS, 		TRNS,											TRNS,											TRNS,		TRNS,		TRNS,		TRNS),
+[_FL] = LAYOUT_60_ansi_split_bs_rshift(
+  KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   RESET,    KC_NO,
+  TRNS,     TRNS,   TRNS,     TRNS,     TRNS,     TRNS,     TRNS,   TRNS,     TRNS,     TRNS,     TRNS,     TRNS,   TRNS,   KC_PSCR,
+  TRNS,     KC_MS_L,  KC_MS_D,  KC_MS_R,  TRNS,   TG(_GA),  TRNS,   TRNS,   TRNS,   TRNS,   TRNS,   TRNS,         TRNS,
+  TRNS,           TRNS,   TRNS,   TRNS,   TRNS,     TRNS,     TRNS,   TRNS,   KC_VOLD,  KC_VOLU,  KC_MUTE,  TRNS,   KC_MPLY,
+  TRNS,     TRNS,     TRNS,                     TRNS,                     TRNS,   TRNS,   TRNS,   TRNS),
 
 //Arrow keys layer (space bar)
-[_AR] = KEYMAP_HHKB(
-	KC_GRV,		KC_F1,		KC_F2,  	KC_F3,  	KC_F4,  	KC_F5,		KC_F6,		KC_F7, 		KC_F8,		KC_F9,		KC_F10,  	KC_F11,		KC_F12,		TRNS,		KC_NO,
-	TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		KC_PGUP, 	KC_UP,  	KC_PGDN,  	TRNS, 		TRNS,		TRNS,		TRNS,
-	TRNS,		TRNS, 		TRNS,   	TRNS, 		TRNS, 		TRNS, 		TRNS, 		KC_LEFT, 	KC_DOWN,  	KC_RGHT,  	TRNS, 		TRNS, 	 				TRNS,
-	TRNS,					TRNS,		TRNS,		TRNS,		TRNS,	 	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS,   	TRNS,
-	TRNS, 		TRNS, 		TRNS,											TRNS,											TRNS,		TRNS, 		TRNS,		TRNS),
+[_AR] = LAYOUT_60_ansi_split_bs_rshift(
+  KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   TRNS,   KC_NO,
+  TRNS,   TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     KC_PGUP,  KC_UP,    KC_PGDN,    TRNS,     TRNS,   TRNS,   TRNS,
+  TRNS,   TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     KC_LEFT,  KC_DOWN,    KC_RGHT,    TRNS,     TRNS,           TRNS,
+  TRNS,         TRNS,   TRNS,   TRNS,   TRNS,   TRNS,     TRNS,     TRNS,     TRNS,     TRNS,   TRNS,     TRNS,     TRNS,
+  TRNS,     TRNS,     TRNS,                     TRNS,                     TRNS,   TRNS,     TRNS,   TRNS),
+
 //Game layer (fn + g)
-[_GA] = KEYMAP_HHKB(
-	TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS,		TRNS,		KC_NO,
-	TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,  		TRNS,  		TRNS, 		TRNS,		TRNS,		TRNS,
-	TRNS,		TRNS, 		TRNS,   	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,  		TRNS,  		TRNS, 		TRNS,  					TRNS,
-	KC_LSFT, 				TRNS, 		TRNS,   	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS,		TRNS,
-	TRNS, 		TRNS, 		TRNS,											KC_SPC,											TRNS,		TRNS, 		MO(_FL),	TRNS),
+[_GA] = LAYOUT_60_ansi_split_bs_rshift(
+  TRNS,   TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,   TRNS,   TRNS,   KC_NO,
+  TRNS,   TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,   TRNS,   TRNS,
+  TRNS,   TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,           TRNS,
+  KC_LSFT,        TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,     TRNS,   TRNS,     TRNS,   TRNS,
+  TRNS,     TRNS,     TRNS,                     KC_SPC,                     TRNS,   TRNS,     MO(_FL),  TRNS),
 
 };
diff --git a/keyboards/gh60/keymaps/maxr1998/keymap.c b/keyboards/gh60/keymaps/maxr1998/keymap.c
index daddb18dea..eff94ff657 100644
--- a/keyboards/gh60/keymaps/maxr1998/keymap.c
+++ b/keyboards/gh60/keymaps/maxr1998/keymap.c
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "gh60.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
 
 #define KC_EURO RALT(KC_5)
 
@@ -34,14 +33,14 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* 0: qwertz */
-  KEYMAP(
+  LAYOUT(
     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,\
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NO,  \
     KC_LOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HOME, KC_ENT, \
     KC_LSFT, KC_BSLS, KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT,\
     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_NO,   F(0),    KC_LEFT, KC_DOWN, KC_RGHT),
   /* 1: fn */
-  KEYMAP(
+  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_DEL, \
     KC_TRNS, KC_TRNS, KC_TRNS, KC_EURO, TP_REQ,  TP_ACC,  KC_TRNS, MCO_UE,  KC_TRNS, MCO_OE,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
     KC_TRNS, MCO_AE,  MCO_SS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_SW,KC_TRNS, KC_GRV,  KC_TRNS,\
diff --git a/keyboards/gh60/keymaps/robotmaxtron/keymap.c b/keyboards/gh60/keymaps/robotmaxtron/keymap.c
index 9acac7cecf..649cbec389 100644
--- a/keyboards/gh60/keymaps/robotmaxtron/keymap.c
+++ b/keyboards/gh60/keymaps/robotmaxtron/keymap.c
@@ -1,5 +1,4 @@
-#include "gh60.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
 
 #define _BL 0
 #define _AL 1
@@ -21,9 +20,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |Ctrl|Gui |Alt |      Space             |Alt |Fn  |Menu|Ctrl|
    * `-----------------------------------------------------------'
    */
-	[_BL] = KEYMAP(
+  [_BL] = LAYOUT(
         F(12),KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC, \
-	KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS, \
+        KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS, \
         F(2),KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT,KC_NO,KC_ENT,  \
         KC_LSFT,KC_NO,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_NO,KC_RSFT, \
         KC_LCTL,KC_LGUI,KC_LALT,        KC_SPC,      KC_NO,KC_RALT,F(0),KC_APP,KC_RCTL),
@@ -42,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |    |    |    |                        |    |    |    |    |
    * `-----------------------------------------------------------'
    */
-	[_AL] = KEYMAP(
+  [_AL] = LAYOUT(
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,KC_TRNS,KC_UP,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
@@ -64,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |    |    |    |                          |    |    |    |    |
    * `-------------------------------------------------------------'
    */
-	[_FL] = KEYMAP(
+  [_FL] = LAYOUT(
         KC_GRAVE,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_DELETE, \
         KC_TRNS,F(1),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS, \
         KC_TRNS,KC_MUTE,KC__VOLDOWN,KC__VOLUP,KC_TRNS,KC_TRNS,KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_INS,KC_TRNS,KC_TRNS,KC_TRNS, \
@@ -86,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |    |    |    |                        |    |    |    |    |
    * `-----------------------------------------------------------'
    */
-	[_UL] = KEYMAP(
+  [_UL] = LAYOUT(
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
         KC_TRNS,F(4),F(5),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, \
diff --git a/keyboards/gh60/keymaps/sethbc/keymap.c b/keyboards/gh60/keymaps/sethbc/keymap.c
index 599e664e23..6c2c00ec27 100644
--- a/keyboards/gh60/keymaps/sethbc/keymap.c
+++ b/keyboards/gh60/keymaps/sethbc/keymap.c
@@ -1,19 +1,18 @@
-#include "gh60.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
 
 #define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 0: qwerty */
-  KEYMAP_HHKB(
-	      F(0),KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSLS,KC_GRV,\
+  LAYOUT_60_ansi_split_bs_rshift(
+        F(0),KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSLS,KC_GRV,\
         KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSPC,\
         KC_LCTL,KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT,KC_ENT,\
         KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,F(1),\
         KC_LCTL,KC_LALT,KC_LGUI,      KC_SPC,            KC_RGUI,KC_RALT,KC_APP,KC_RCTL),
     /* 1: fn */
-	KEYMAP_HHKB(
+  LAYOUT_60_ansi_split_bs_rshift(
         KC_GRV,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_TRNS,KC_TRNS,\
         KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_UP,KC_TRNS,KC_TRNS,\
         KC_TRNS,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RIGHT,KC_PENT,\
diff --git a/keyboards/gh60/keymaps/xyverz/keymap.c b/keyboards/gh60/keymaps/xyverz/keymap.c
index 19fc37a6d0..3709a0c052 100644
--- a/keyboards/gh60/keymaps/xyverz/keymap.c
+++ b/keyboards/gh60/keymaps/xyverz/keymap.c
@@ -1,6 +1,4 @@
 #include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "eeconfig.h"
 
 
 extern keymap_config_t keymap_config;
@@ -26,94 +24,97 @@ extern keymap_config_t keymap_config;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    /*
-     *  _QW: Qwerty Layer
-     * ,-----------------------------------------------------------.
-     * |ESC | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Backsp|
-     * |-----------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|
-     * |-----------------------------------------------------------|
-     * |Fn     |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| Return|
-     * |-----------------------------------------------------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|     Shift|
-     * |-----------------------------------------------------------|
-     * |Ctrl|Alt |Gui |      Space             |Gui |Alt |Ctrl|  Fn|
-     * `-----------------------------------------------------------'
-     */
-[_QW] = { /* Layer 0: Qwerty */
-    {KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC},
-    {KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS},
-    {MO(_FL), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT },
-    {KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX, KC_RSFT},
-    {KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL)}
-  },
-
-    /*
-     *  _DV: Dvorak Layer
-     * ,-----------------------------------------------------------.
-     * |ESC | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  [|  ]| Backsp|
-     * |-----------------------------------------------------------|
-     * |Tab  |  '|  ,|  .|  P|  Y|  F|  G|  C|  R|  L|  /|  =|    \|
-     * |-----------------------------------------------------------|
-     * |Fn     |  A|  O|  E|  U|  I|  D|  H|  T|  N|  S|  -| Return|
-     * |-----------------------------------------------------------|
-     * |Shift   |  ;|  Q|  J|  K|  X|  B|  M|  W|  V|  Z|     Shift|
-     * |-----------------------------------------------------------|
-     * |Ctrl|Alt |Gui |      Space             |Gui |Alt |Ctrl|  Fn|
-     * `-----------------------------------------------------------'
-     */
-[_DV] = { /* Layer 1: Dvorak */
-    {KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC},
-    {KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSLS},
-    {MO(_FL), KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, XXXXXXX, KC_ENT },
-    {KC_LSFT, XXXXXXX, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    XXXXXXX, KC_RSFT},
-    {KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL)}
-  },
-
-    /*
-     *  _CM: Colemak Layer
-     * ,-----------------------------------------------------------.
-     * |ESC | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Backsp|
-     * |-----------------------------------------------------------|
-     * |Tab  |  Q|  W|  F|  P|  G|  J|  L|  U|  Y|  ;|  [|  ]|    \|
-     * |-----------------------------------------------------------|
-     * |Fn     |  A|  R|  S|  T|  D|  H|  N|  E|  I|  O|  '| Return|
-     * |-----------------------------------------------------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  K|  M|  ,|  .|  /|     Shift|
-     * |-----------------------------------------------------------|
-     * |Ctrl|Alt |Gui |      Space             |Gui |Alt |Ctrl|  Fn|
-     * `-----------------------------------------------------------'
-     */
-[_CM] = { /* Layer 2: Colemak */
-    {KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC},
-    {KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS},
-    {MO(_FL), KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, XXXXXXX, KC_ENT },
-    {KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX, KC_RSFT},
-    {KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL)}
-  },
-
-    /*
-     *  _FL: Function Layer
-     * ,-----------------------------------------------------------.
-     * |    |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|    Del|
-     * |-----------------------------------------------------------|
-     * |     |   |   |   |   |   |   |PgU| Up|PgD|PSc|SLk|Pau|     |
-     * |-----------------------------------------------------------|
-     * |       |   |MPr|MPl|MNx|   |Hom| Lt| Dn| Rt|   |   |       |
-     * |-----------------------------------------------------------|
-     * |CAPS    |   |Mut|VlD|VlU|   |End|   |   |   |   |          |
-     * |-----------------------------------------------------------|
-     * |_QW |_DV |_CM |                        |    |    |    |    |
-     * `-----------------------------------------------------------'
-     */
-[_FL] = { /* Layer 3: Functions */
-    {_______, 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_DEL },
-    {_______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______},
-    {_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, XXXXXXX, _______},
-    {KC_CAPS, XXXXXXX, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_END,  _______, _______, _______, _______, XXXXXXX, _______},
-    {QWERTY,  DVORAK,  COLEMAK, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______}
-  },
-
+  /*
+   *  _QW: Qwerty Layer
+   * ,-----------------------------------------------------------.
+   * |ESC | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Backsp|
+   * |-----------------------------------------------------------|
+   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|
+   * |-----------------------------------------------------------|
+   * |Fn     |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| Return|
+   * |-----------------------------------------------------------|
+   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|     Shift|
+   * |-----------------------------------------------------------|
+   * |Ctrl|Alt |Gui |      Space             |Gui |Alt |Ctrl|  Fn|
+   * `-----------------------------------------------------------'
+   */
+  /* Layer 0: Qwerty */
+  [_QW] = LAYOUT_60_ansi(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+    MO(_FL), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT ,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT,
+    KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                                      KC_RGUI, KC_RALT, KC_RCTL, MO(_FL)
+  ),
+
+  /*
+   *  _DV: Dvorak Layer
+   * ,-----------------------------------------------------------.
+   * |ESC | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  [|  ]| Backsp|
+   * |-----------------------------------------------------------|
+   * |Tab  |  '|  ,|  .|  P|  Y|  F|  G|  C|  R|  L|  /|  =|    \|
+   * |-----------------------------------------------------------|
+   * |Fn     |  A|  O|  E|  U|  I|  D|  H|  T|  N|  S|  -| Return|
+   * |-----------------------------------------------------------|
+   * |Shift   |  ;|  Q|  J|  K|  X|  B|  M|  W|  V|  Z|     Shift|
+   * |-----------------------------------------------------------|
+   * |Ctrl|Alt |Gui |      Space             |Gui |Alt |Ctrl|  Fn|
+   * `-----------------------------------------------------------'
+   */
+  /* Layer 1: Dvorak */
+  [_DV] = LAYOUT_60_ansi(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC,
+    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSLS,
+    MO(_FL), KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,          KC_ENT,
+    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,                      KC_RSFT,
+    KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                                      KC_RGUI, KC_RALT, KC_RCTL, MO(_FL)
+  ),
+
+  /*
+   *  _CM: Colemak Layer
+   * ,-----------------------------------------------------------.
+   * |ESC | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Backsp|
+   * |-----------------------------------------------------------|
+   * |Tab  |  Q|  W|  F|  P|  G|  J|  L|  U|  Y|  ;|  [|  ]|    \|
+   * |-----------------------------------------------------------|
+   * |Fn     |  A|  R|  S|  T|  D|  H|  N|  E|  I|  O|  '| Return|
+   * |-----------------------------------------------------------|
+   * |Shift   |  Z|  X|  C|  V|  B|  K|  M|  ,|  .|  /|     Shift|
+   * |-----------------------------------------------------------|
+   * |Ctrl|Alt |Gui |      Space             |Gui |Alt |Ctrl|  Fn|
+   * `-----------------------------------------------------------'
+   */
+  /* Layer 2: Colemak */
+  [_CM] = LAYOUT_60_ansi(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,
+    MO(_FL), KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,          KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT,
+    KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                                      KC_RGUI, KC_RALT, KC_RCTL, MO(_FL)
+  ),
+
+  /*
+   *  _FL: Function Layer
+   * ,-----------------------------------------------------------.
+   * |    |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|    Del|
+   * |-----------------------------------------------------------|
+   * |     |   |   |   |   |   |   |PgU| Up|PgD|PSc|SLk|Pau|     |
+   * |-----------------------------------------------------------|
+   * |       |   |MPr|MPl|MNx|   |Hom| Lt| Dn| Rt|   |   |       |
+   * |-----------------------------------------------------------|
+   * |CAPS    |   |Mut|VlD|VlU|   |End|   |   |   |   |          |
+   * |-----------------------------------------------------------|
+   * |_QW |_DV |_CM |                        |    |    |    |    |
+   * `-----------------------------------------------------------'
+   */
+  /* Layer 3: Functions */
+  [_FL] = LAYOUT_60_ansi(
+    _______, 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_DEL ,
+    _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+    _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,
+    KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_END,  _______, _______, _______, _______,                   _______,
+    QWERTY,  DVORAK,  COLEMAK,                   _______,                                     _______, _______, _______, _______
+  ),
 
 };