Merge remote-tracking branch 'upstream/master' into bananasplit

# Conflicts:
#	keyboards/bananasplit/Makefile
#	keyboards/bananasplit/bananasplit.c
#	keyboards/bananasplit/bananasplit.h
#	keyboards/bananasplit/config.h
#	keyboards/bananasplit/keymaps/default/keymap.c
#	keyboards/bananasplit/rules.mk

diff --cc keyboards/bananasplit/bananasplit.h
index aeb27da1005f9b1073971d88d8d02df383c32fb0,5be3d881a4cd3a72d89d7a472b1378919668192b..fa4c13258bfe7f5df6f99aff2d337733f905fade
--- 1/keyboards/bananasplit/bananasplit.h
--- 2/keyboards/bananasplit/bananasplit.h
+++ b/keyboards/bananasplit/bananasplit.h
@@@ -18,67 -19,89 +19,124 @@@ along with this program.  If not, see <
  
  #include "quantum.h"
  
- #define KEYMAP( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
-     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,\
-     K40, K41, K42,      K44, K45, K46,      K48, K49, K4A, K4B, K4C  \
- ) { \
-     { K00, K01,   K02, K03,   K04, K05, K06, K07,   K08, K09, K0A, K0B, K0C, K0D   }, \
-     { K10, K11,   K12, K13,   K14, K15, K16, K17,   K18, K19, K1A, K1B, K1C, K1D   }, \
-     { K20, K21,   K22, K23,   K24, K25, K26, K27,   K28, K29, K2A, K2B, K2C, KC_NO }, \
-     { K30, KC_NO, K32, K33,   K34, K35, K36, K37,   K38, K39, K3A, K3B, K3C, K3D   }, \
-     { K40, K41,   K42, KC_NO, K44, K45, K46, KC_NO, K48, K49, K4A, K4B, K4C, KC_NO }  \
 +/*
 +-------------------------------------------------------------------------------------------
 +| K00 | K01 | K02 | K03 | K04 | K05 | K06 | K07 | K08 | K09 | K0A | K0B | K0C |    K0D    |
 +-------------------------------------------------------------------------------------------
 +|  K10   | K11 | K12 | K13 | K14 | K15 | K16 | K17 | K18 | K19 | K1A | K1B | K1C |  K1D   |
 +-------------------------------------------------------------------------------------------
 +|   K20   | K21 | K22 | K23 | K24 | K25 | K26 | K27 | K28 | K29 | K2A | K2B |     K2C     |
 +-------------------------------------------------------------------------------------------
 +|     K30     | K32 | K33 | K34 | K35 | K36 | K37 | K38 | K39 | K3A | K3B |   K3C   | K3D |
 +-------------------------------------------------------------------------------------------
 +|  K40  |  K41  |  K42  |     K44     |  K45  |     K46     | K48 | K49 | K4A | K4B | K4C |
 +-------------------------------------------------------------------------------------------
 +*/
 -    { K40, K41, K42, KC_NO,    K44, K45, K46, KC_NO,    K48, K49, K4A, K4B, K4C }   \
+ #define KEYMAP(                                                                     \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,           \
+     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
+     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                \
+     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,           \
+     K40, K41, K42,      K44, K45, K46,      K48, K49, K4A, K4B, K4C                 \
+ ) {                                                                                 \
+     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D },       \
+     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D },       \
+     { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO },     \
+     { K30, KC_NO,    K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D },  \
++    { K40, K41, K42, KC_NO,    K44, K45, K46, KC_NO,    K48, K49, K4A, K4B, K4C, KC_NO }   \
  }
 +/* Here is the above keymap filled with KC_TRNS. It's a useful starting point when defining layers.
 +KEYMAP( \
 +    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
 +    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
 +    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
 +    ______,         ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,\
 +    ______, ______, ______,         ______, ______, ______,         ______, ______, ______, ______, ______  \
 +)
 +*/
  
 -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,           \
+ #define KEYMAP_HHKBANANA(                                                           \
 -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,           \
++    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D,      \
+     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
 -    { K40, K41, K42, KC_NO,    K44, K45, K46, KC_NO,    K48, K49, K4A, K4B, K4C }   \
++    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                \
+     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                \
+     K40, K41, K42,      K44, K45, K46,      K48, K49, K4A, K4B, K4C                 \
+ ) { \
+     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D },       \
+     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D },       \
+     { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D },       \
+     { K30, KC_NO,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO }, \
 -    { K40, K41, K42, KC_NO,    KC_NO,    K45, KC_NO,    KC_NO,    K48, K49, KC_NO,  K4B, K4C }  \
++    { K40, K41, K42, KC_NO,    K44, K45, K46, KC_NO,    K48, K49, K4A, K4B, K4C, KC_NO }   \
+ }
+ 
+ #define KEYMAP_ANSI( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,           \
+     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
+     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                \
+     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                \
+     K40, K41, K42,           K45,           K48, K49,      K4B, K4C                 \
+ ) {                                                                                 \
+     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D },       \
+     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D },       \
+     { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO },     \
+     { K30, KC_NO,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO }, \
 -    { K40, K41, K42, KC_NO,    KC_NO,    K45, KC_NO,    KC_NO,    K48, K49, KC_NO,    K4B, K4C }  \
++    { K40, K41, K42, KC_NO,    KC_NO,    K45, KC_NO,    KC_NO,    K48, K49, KC_NO,  K4B, K4C, KC_NO }  \
+ }
+ 
+ #define KEYMAP_ISO( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
+     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
+     K40, K41, K42,           K45,           K48, K49,      K4B, K4C  \
+ ) { \
+     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+     { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO }, \
+     { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO }, \
++    { K40, K41, K42, KC_NO,    KC_NO,    K45, KC_NO,    KC_NO,    K48, K49, KC_NO,    K4B, K4C, KC_NO }  \
+ }
+ 
 +/*
 +-------------------------------------------------------------------------------------------
 +| K00 | K01 | K02 | K03 | K04 | K05 | K06 | K07 | K08 | K09 | K0A | K0B | K0C | K0D | K2D |
 +-------------------------------------------------------------------------------------------
 +|  K10   | K11 | K12 | K13 | K14 | K15 | K16 | K17 | K18 | K19 | K1A | K1B | K1C |  K1D   |
 +-------------------------------------------------------------------------------------------
 +|   K20   | K21 | K22 | K23 | K24 | K25 | K26 | K27 | K28 | K29 | K2A | K2B |     K2C     |
 +-------------------------------------------------------------------------------------------
 +|  K30  | K31 | K32 | K33 | K34 | K35 | K36 | K37 | K38 | K39 | K3A | K3B |   K3C   | K3D |
 +-------------------------------------------------------------------------------------------
 +|  K40  |  K41  |  K42  |     K44     |  K45  |     K46     | K48 | K49 | K4A | K4B | K4C |
 +-------------------------------------------------------------------------------------------
 +*/
  #define KEYMAP_ALL( \
 -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
 +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
-     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
-     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           \
-     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      \
-     K40, K41, K42,      K44, K45, K46,      K48, K49, K4A, K4B, K4C            \
+     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
 -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,\
 -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,\
++    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
++    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+     K40, K41, K42,      K44, K45, K46,      K48, K49, K4A, K4B, K4C  \
  ) { \
-     { K00, K01, K02, K03,   K04, K05, K06, K07,   K08, K09, K0A, K0B, K0C, K0D   }, \
-     { K10, K11, K12, K13,   K14, K15, K16, K17,   K18, K19, K1A, K1B, K1C, K1D   }, \
-     { K20, K21, K22, K23,   K24, K25, K26, K27,   K28, K29, K2A, K2B, K2C, K2D   }, \
-     { K30, K31, K32, K33,   K34, K35, K36, K37,   K38, K39, K3A, K3B, K3C, K3D   }, \
-     { K40, K41, K42, KC_NO, K44, K45, K46, KC_NO, K48, K49, K4A, K4B, K4C, KC_NO }  \
+     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+     { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+     { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
 -    { K40, K41, K42, KC_NO,    K44, K45, K46, KC_NO,    K48, K49, K4A, K4B, K4C }  \
++    { K40, K41, K42, KC_NO,    K44, K45, K46, KC_NO,    K48, K49, K4A, K4B, K4C, KC_NO }  \
  }
  
 -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+ #define KEYMAP_HHKB_ARROW( \
 -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,\
++    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
+     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
 -    { K40, K41, K42, KC_NO,    K44, K45, K46, KC_NO,    K48, K49, K4A, K4B, K4C }  \
++    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
+     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,\
+     K40, K41, K42,      K44, K45, K46,      K48, K49, K4A, K4B, K4C  \
+ ) { \
+     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+     { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+     { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
++    { K40, K41, K42, KC_NO,    K44, K45, K46, KC_NO,    K48, K49, K4A, K4B, K4C, KC_NO }  \
+ }
+ 
+ 
  #endif

diff --cc keyboards/bananasplit/keymaps/default/readme.md
index 9e8eeb5bdd3198e7e7667adf091e3d90db200b4c,0000000000000000000000000000000000000000..aaf6daa08c5336ce6ae49d5a93a01127cf9e672b
mode 100644,000000..100644
--- 1/keyboards/bananasplit/keymaps/default/readme.md
--- /dev/null
+++ b/keyboards/bananasplit/keymaps/default/readme.md
@@@ -1,17 -1,0 +1,1 @@@
- 
- ```
- -------------------------------------------------------------------------------------------
- | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | Backspace |
- -------------------------------------------------------------------------------------------
- |  Tab   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    |
- -------------------------------------------------------------------------------------------
- | CapsLck |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
- -------------------------------------------------------------------------------------------
- |    Shift    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |RSFT_T(/)| Up  |Light|
- -------------------------------------------------------------------------------------------
- | Ctrl  |  GUI  |  Alt  |    Enter    |  App  |    Space    | Alt |Ctrl |Left |Down |Right|
- -------------------------------------------------------------------------------------------
- ```
- 
- The `RSFT_T(/)` key works as `/` when tapped and as right shift when held.
 +# The default keymap for the Bananasplit

diff --cc keyboards/bananasplit/keymaps/hhkbanana/keymap.c
index 0000000000000000000000000000000000000000,b6c1d268b24f03795530e7ecf06bf7a2ea1f52d9..10593de8dba48d26d4e85ea5ce9be96b06dd7f4a
mode 000000,100644..100644
--- /dev/null
--- 2/keyboards/bananasplit/keymaps/hhkbanana/keymap.c
+++ b/keyboards/bananasplit/keymaps/hhkbanana/keymap.c
@@@ -1,0 -1,25 +1,25 @@@
 -    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, \
+ #include "bananasplit.h"
+ 
+ #define DEFAULT_LAYER 0
+ #define LAYER_1       1
+ 
+ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [DEFAULT_LAYER] = KEYMAP_HHKBANANA( \
 -    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,   KC_PSCR, \
++    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_PSCR, \
+     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_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_LGUI,  KC_LALT, KC_ENT,      MO(LAYER_1),      KC_SPC,  KC_RALT, KC_RCTL,  KC_LEFT, KC_DOWN, KC_RIGHT \
+   ),
+ 
+   [LAYER_1] = KEYMAP_HHKBANANA( \
++    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
++    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+     _______, _______, _______,          _______, _______, _______,          _______, _______, _______, _______, _______ \
+   ),
+ };
+ 
+ const uint16_t PROGMEM fn_actions[] = {
+ };

diff --cc keyboards/bananasplit/keymaps/nic/keymap.c
index 0000000000000000000000000000000000000000,d8a5d0b17bfac5ecc9c0822b5f532bd0bb6cc259..f9794b5b10cc0eb7dbeb5852fce392457bd6461a
mode 000000,100644..100644
--- /dev/null
--- 2/keyboards/bananasplit/keymaps/nic/keymap.c
+++ b/keyboards/bananasplit/keymaps/nic/keymap.c
@@@ -1,0 -1,45 +1,45 @@@
 -    KC_GRV, 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, \
+ #include "bananasplit.h"
+ 
+ #define DEFAULT_LAYER 0
+ #define THUMB_LAYER   1
+ #define NORMAN_LAYER  2
+ #define MOD_LAYER     3
+ 
+ #define HYPER_TAB ALL_T(KC_TAB)
+ 
+ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [DEFAULT_LAYER] = KEYMAP_HHKB_ARROW( \
 -    CTL_T(KC_ESC),   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_DEL, \
++    KC_GRV, 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_DEL, \
+     HYPER_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, \
 -    MO(MOD_LAYER), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, \
++    CTL_T(KC_ESC),   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,  RSFT_T(KC_SLSH),  KC_UP, TG(NORMAN_LAYER), \
+     KC_CAPS,  KC_LALT,  KC_LGUI,  KC_SPC,      MO(THUMB_LAYER),      KC_SPC,  KC_LGUI, KC_LALT,  KC_LEFT, KC_DOWN, KC_RIGHT \
+   ),
+ 
+   [THUMB_LAYER] = KEYMAP_HHKB_ARROW( \
 -    _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_MINS,   KC_EQL,   KC_LBRC, KC_RBRC,  _______, _______, _______, \
++    MO(MOD_LAYER), 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_UNDS,   KC_PLUS,   KC_LCBR,   KC_RCBR,   _______, _______, _______, \
 -    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
++    _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_MINS,   KC_EQL,   KC_LBRC, KC_RBRC,  _______, _______, \
+     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______, \
+     _______,  _______,  _______, _______,      _______,      _______,  _______, _______,  _______, _______, _______ \
+   ),
+ 
+   [NORMAN_LAYER] = KEYMAP_HHKB_ARROW( \
 -    _______,   _______,   _______,   KC_E,   KC_T,  _______,   KC_Y,   KC_N,   KC_I,   KC_O,   KC_H,  _______, _______, _______, \
++    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+     _______,  _______,   _______,   KC_D,   KC_F,   KC_K,   KC_J,   KC_U,   KC_R,   KC_L,   KC_SCLN,   _______, _______, _______, \
 -    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
++    _______,   _______,   _______,   KC_E,   KC_T,  _______,   KC_Y,   KC_N,   KC_I,   KC_O,   KC_H,  _______, _______, \
+     _______,   _______,   _______,   _______,   _______,   _______,   KC_P,   _______,   _______,  _______,  _______,  _______, _______, \
+     _______,  _______,  _______, _______,      _______,      _______,  _______, _______,  _______, _______, _______ \
+   ),
+ 
+   [MOD_LAYER] = KEYMAP_HHKB_ARROW( \
 -    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______, _______, _______, \
++    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+     _______,  _______,   _______,   _______,  RESET,  _______,   _______,   _______,   _______,   _______,   _______,   _______, _______, _______, \
++    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______, _______, \
+     _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______, \
+     _______,  _______,  _______, _______,      _______,      _______,  _______, _______,  _______, _______, _______ \
+   ),
+ };
+ 
+ const uint16_t PROGMEM fn_actions[] = {
+ };