Keymap: Wanleg 5x5 Keymap changes (#4738)

* config fixes (including for issue #3678)

* put back audio

* jj40 backlighting setup

* jj40 backlighting setup

* rules.mk fix

* jj40 backlighting settings

* iris setup

* iris setup

* iris setup

* iris setup

* iris setup - onehand

* remove commented-out section

* edits due to #4403

* xd75 testing

* fix 5x15 layout issues with 5x5 bluetooth & xd75

* commenting out unused placeholders

* change iris to more wanleg-like 4x12 layout

* formatting changes

* onehand layout cleanup/fix

* revert temp change

* create centre numpad option

* 1st working version

* change keypad numbers to regular numbers - doesn't work otherwise

* adding comparison files, no change to core

* fixed 5x5 with cleave

* fixed 5x5 with cleave

* switch mouse scroll buttons

* clean up left/right/centre pad placement in 5x15 layouts

* minor comment change

* Update layouts/community/ortho_5x15/wanleg/keymap.c

Co-Authored-By: wanleg <32079073+wanleg@users.noreply.github.com>

* Update layouts/community/ortho_5x15/wanleg/keymap.c

Co-Authored-By: wanleg <32079073+wanleg@users.noreply.github.com>

* Update layouts/community/ortho_5x15/wanleg/keymap.c

Co-Authored-By: wanleg <32079073+wanleg@users.noreply.github.com>

* revert to original

5 files changed, 109 insertions, 168 deletions

diff --git a/layouts/community/ortho_5x15/wanleg/keymap.c b/layouts/community/ortho_5x15/wanleg/keymap.c
index 51b020fcde..a98f61988c 100644
--- a/layouts/community/ortho_5x15/wanleg/keymap.c
+++ b/layouts/community/ortho_5x15/wanleg/keymap.c
@@ -1,26 +1,71 @@
 #include QMK_KEYBOARD_H
 #include "wanleg.h"
 
-#define _________________BLANK_75__________________ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 #define _________________BLANK_50__________________ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-#define _________________Num_Row_75________________ KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NLCK
+
+#if defined(PADC)
+#define LAYOUT_75_base( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e  \
+  ) \
+   LAYOUT_ortho_5x15_wrapper( \
+     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NLCK,  QWERTY, GHERKIN, FUNCTION, \
+     K00, K01, K02, K03, K04, K05, 		K0c,  K0d,  K0e,		K06, K07, K08, K09, K0a, K0b, \
+     K10, K11, K12, K13, K14, K15, 		K1c,  K1d,  K1e,		K16, K17, K18, K19, K1a, K1b, \
+     K20, K21, K22, K23, K24, K25, 		K2c,  K2d,  K2e,		K26, K27, K28, K29, K2a, K2b, \
+     K30, K31, K32, K33, K34, K35, 		K3c,  K3d,  K3e,	    K36, K37, K38, K39, K3a, K3b  \
+  )
+
+#elif defined(PADL)
+#define LAYOUT_75_base( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e  \
+  ) \
+   LAYOUT_ortho_5x15_wrapper( \
+     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NLCK,  QWERTY, GHERKIN, FUNCTION, \
+     K0c,  K0d,  K0e,		K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
+     K1c,  K1d,  K1e, 		K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
+     K2c,  K2d,  K2e, 		K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
+     K3c,  K3d,  K3e,  		K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b 	\
+  )
+  
+#else
+#define LAYOUT_75_base( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e  \
+  ) \
+   LAYOUT_ortho_5x15_wrapper( \
+     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NLCK,  QWERTY, GHERKIN, FUNCTION, \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, 		K0c,  K0d,  K0e, \
+     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, 		K1c,  K1d,  K1e, \
+     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, 		K2c,  K2d,  K2e, \
+     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, 		K3c,  K3d,  K3e  \
+  )
+#endif  
+
+#define LAYOUT_75_base_wrapper(...)       LAYOUT_75_base(__VA_ARGS__)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #if defined(KEYBOARD_40percentclub_5x5)
-[GK75] = LAYOUT_ortho_5x15_wrapper(
-  _________________Num_Row_75________________, QWERTY75, XXXXXXX, FUNCTION75,
-  _______________GherkinLike_0_______________, KC_KP_7, KC_KP_8, KC_KP_9,
-  _______________GherkinLike_1_______________, KC_KP_4, KC_KP_5, KC_KP_6,
-  TD(TD_SFT_CAPS), SFT_T(KC_Z), KC_X, KC_C, LT(NUM75, KC_V), LT(ETC75, KC_B), KC_N, LT(DIR75, KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC), SFT_T(KC_ENT), KC_KP_1, KC_KP_2, KC_KP_3,
-  TD(RST_TAP_DANCE), GHERKIN50, KC_LALT, NUMPAD, NUMBER75, ETCETERA75, KC_SPC,DIRECTION75, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT
+[_GK] = LAYOUT_75_base_wrapper(
+  _______________GherkinLike_0_______________, KC_7, KC_8, KC_9,
+  _______________GherkinLike_1_______________, KC_4, KC_5, KC_6,
+  TD(TD_SFT_CAPS), SFT_T(KC_Z), KC_X, KC_C, LT(NUM, KC_V), LT(ETC, KC_B), KC_N, LT(DIR, KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC), SFT_T(KC_ENT), KC_1, KC_2, KC_3,
+  TD(RST_TAP_DANCE), GHERKIN50, KC_LALT, NUMPAD, NUMBER, ETCETERA, KC_SPC,DIRECTION, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_0, KC_0, KC_DOT
 ),
 
 [GK50] = LAYOUT_ortho_5x10_wrapper(
-  KC_ESC,    _______, _______, _______, _______, _______, _______, _______, _______,    KC_BSPC,
+  KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC,
   _______________Gherkin_Row_0_______________,
   _______________Gherkin_Row_1_______________,
   _______________Gherkin_Row_2_______________,
-  TD(RST_TAP_DANCE), GHERKIN75, NUMPAD, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, KC_RALT, KC_RGUI
+  TD(RST_TAP_DANCE), GHERKIN, NUMPAD, gNUMBER, gETCETERA, KC_SPC,gDIRECTION, KC_RGUI, KC_RALT, KC_RGUI
 ),
 
 [gNUM] = LAYOUT_ortho_5x10_wrapper(
@@ -65,9 +110,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 #endif
 #else
- /* Gherkin 75
+ /* Gherkin
  * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | NUMLOCK| qwerty |        | FN     |
+ * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | NUMLOCK| qwerty | gherkin| FN     |
  * |-----------------------------------------------------------------------------------------------------------+--------+--------+--------|
  * |                                                                                                           |   7    |   8    |   9    |
  * |                                                                                                           |--------+--------+--------|
@@ -78,17 +123,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |                                                                                                           |   0    |   0    |   .    |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[GK75] = LAYOUT_ortho_5x15_wrapper(
-  _________________Num_Row_75________________, QWERTY75, XXXXXXX, FUNCTION75,
-  _______________GherkinLike_0_______________, KC_KP_7, KC_KP_8, KC_KP_9,
-  _______________GherkinLike_1_______________, KC_KP_4, KC_KP_5, KC_KP_6,
-  TD(TD_SFT_CAPS), SFT_T(KC_Z), KC_X, KC_C, LT(NUM75, KC_V), LT(ETC75, KC_B), KC_N, LT(DIR75, KC_M), GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_BSPC), SFT_T(KC_ENT), KC_KP_1, KC_KP_2, KC_KP_3,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, NUMBER75, ETCETERA75, KC_SPC,DIRECTION75, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT
+[_GK] = LAYOUT_75_base_wrapper(
+  _______________GherkinLike_0_______________, KC_7, KC_8, KC_9,
+  _______________GherkinLike_1_______________, KC_4, KC_5, KC_6,
+  _______________GherkinLike_2_______________, KC_1, KC_2, KC_3,
+  _______________GherkinLike_3_______________, KC_0, KC_0, KC_DOT
 ),
 #endif
- /* QWERTY 75
+/* QWERTY
  * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | NUMLOCK| gherkin|        | FN     |
+ * | ESC    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | NUMLOCK| qwerty | gherkin| FN     |
  * |-----------------------------------------------------------------------------------------------------------+--------+--------+--------|
  * |                                                                                                           |   7    |   8    |   9    |
  * |                                                                                                           |--------+--------+--------|
@@ -99,17 +143,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |                                                                                                           |   0    |   0    |   .    |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[QW75] = LAYOUT_ortho_5x15_wrapper(
-  _________________Num_Row_75________________, GHERKIN75, XXXXXXX, FUNCTION75,
-  _______________Qwerty_Row__0_______________, KC_KP_7, KC_KP_8, KC_KP_9,
-  _______________Qwerty_Row__1_______________, KC_KP_4, KC_KP_5, KC_KP_6,
-  _______________Qwerty_Row__2_______________, KC_KP_1, KC_KP_2, KC_KP_3,
-  KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, SUBTER75, KC_LSFT, KC_SPC, SUPRA75, KC_RGUI, KC_RALT, KC_DEL, KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT
+[_QW] = LAYOUT_75_base_wrapper(
+  _______________Qwerty_Row__0_______________, KC_7, KC_8, KC_9,
+  _______________Qwerty_Row__1_______________, KC_4, KC_5, KC_6,
+  _______________Qwerty_Row__2_______________, KC_1, KC_2, KC_3,
+  _______________Qwerty_Row__3_______________, KC_0, KC_0, KC_DOT
 ),
 
- /* SUBTER75
+ /* SUBTER
  * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |                                            SUBTER ROW 0 LAYOUT                                            |        |        |        |
+ * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |-----------------------------------------------------------------------------------------------------------+--------+-----------------|
  * |                                                                                                           |   /    |   *    |   -    |
  * |                                                                                                           |--------+--------+--------|
@@ -120,15 +163,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |                                                                                                           |        |        |        |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[SUB75] = LAYOUT_ortho_5x15_wrapper(
-  _______________SUBTER_Row__0_______________, _______, _______, _______,
+[SUB] = LAYOUT_75_base_wrapper(
   _______________SUBTER_Row__0_______________, KC_PSLS, KC_PAST, KC_PMNS,
-  _______________SUBTER_Row__1_______________, _______, _______, KC_PPLS,
+  _______________SUBTER_Row__1_______________, _______, _______, KC_PPLS, 
   _______________SUBTER_Row__2_______________, _______, _______, KC_PENT,
-  _______, _______, GHERKIN75, _______, _______, _______, KC_ENT, KC_LSFT, _______, _______,	_______,	_______, _______,	_______,	_______
+  _______________SUBTER_Row__3_______________, _______,	_______, _______
 ),
 
-/* SUPRA75
+/* SUPRA
  * .--------------------------------------------------------------------------------------------------------------------------------------.
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
@@ -141,15 +183,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |                                                                                                           |        |        |        |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[SUP75] = LAYOUT_ortho_5x15_wrapper(
-  _________________BLANK_75__________________,
+[SUP] = LAYOUT_75_base_wrapper(
   ________________SUPRA_Row_0________________, _______, _______, _______,
   ________________SUPRA_Row_1________________, _______, _______, _______,
   ________________SUPRA_Row_2________________, _______, _______, _______,
-  _________________BLANK_75__________________
+  ________________SUPRA_Row_3________________, _______, _______, _______
 ),
 
-/* Gherkin 75 Numbers
+/* Gherkin Numbers
  * .--------------------------------------------------------------------------------------------------------------------------------------.
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
@@ -162,15 +203,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |                                                                                                           |        |        |        |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[NUM75] = LAYOUT_ortho_5x15_wrapper(
-  _________________BLANK_75__________________,
+[NUM] = LAYOUT_75_base_wrapper(
   _______________NUMBERS_Row_0_______________, KC_PSLS, KC_PAST, KC_PMNS,
   _______________NUMBERS_Row_1_______________, _______, _______, KC_PPLS,
   _______________NUMBERS_Row_2_______________, _______, _______, KC_PENT,
   _______________NUMBERS_Row_3_______________, _______, _______, _______
 ),
 
-/* Gherkin 75 Et Cetera
+/* Gherkin Et Cetera
  * .--------------------------------------------------------------------------------------------------------------------------------------.
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
@@ -183,15 +223,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |                                                                                                           |        |        |        |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[ETC75] = LAYOUT_ortho_5x15_wrapper(
-  _________________BLANK_75__________________,
+[ETC] = LAYOUT_75_base_wrapper(
   ______________ETCETERA_Row__0______________, _______, _______, _______,
   ______________ETCETERA_Row__1______________, _______, _______, _______,
   ______________ETCETERA_Row__2______________, _______, _______, _______,
   ______________ETCETERA_Row__3______________, _______, _______, _______
 ),
 
-/* Gherkin 75 Directional Keys
+/* Gherkin Directional Keys
  * .--------------------------------------------------------------------------------------------------------------------------------------.
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |-----------------------------------------------------------------------------------------------------------|--------+-----------------|
@@ -204,16 +243,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |                                                                                                           |        |        |        |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[DIR75] = LAYOUT_ortho_5x15_wrapper(
-  _________________BLANK_75__________________,
+[DIR] = LAYOUT_75_base_wrapper(
   _____________DIRECTIONS_Row__0_____________, _______, _______, _______,
   _____________DIRECTIONS_Row__1_____________, _______, _______, _______,
   _____________DIRECTIONS_Row__2_____________, _______, _______, _______,
-  _______, _______, QWERTY75,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  _____________DIRECTIONS_Row__3_____________, _______, _______, _______
 ),
 
 
-/* FUNCTION 75
+/* FUNCTION 
  * .--------------------------------------------------------------------------------------------------------------------------------------.
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
@@ -226,9 +264,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |        |        |        |        |        |        | MS BT1 |        |        |        |        |        | MOUS L | MOUS D | MOUS R |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[FN75] = LAYOUT_ortho_5x15_wrapper(
-  _________________BLANK_75__________________,
-  _________________BLANK_75__________________,
+[_FN] = LAYOUT_75_base_wrapper(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
   KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, KC_WH_U,
   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,  _______, _______, KC_MS_U, KC_WH_D,
   _______, _______, _______, _______, _______, _______, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
diff --git a/users/wanleg/rules.mk b/users/wanleg/rules.mk
index c6569594b3..b069cd8d38 100644
--- a/users/wanleg/rules.mk
+++ b/users/wanleg/rules.mk
@@ -27,4 +27,13 @@ ifeq ($(strip $(BT)), yes)
   CONSOLE_ENABLE = no 		# Console for debug(+400)
   COMMAND_ENABLE = no 		# Commands for debug and configuration
   RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+endif
+
+#move numpad to Left/Centre/Right(default) on 5x15 boards
+#example usage: make 4x4:wanleg padc=yes
+ifeq ($(strip $(padc)), yes)
+	OPT_DEFS += -DPADC
+endif
+ifeq ($(strip $(padl)), yes)
+	OPT_DEFS += -DPADL
 endif
\ No newline at end of file
diff --git a/users/wanleg/tapdances.c b/users/wanleg/tapdances.c
index e5051f9ee6..1be5636dc7 100644
--- a/users/wanleg/tapdances.c
+++ b/users/wanleg/tapdances.c
@@ -168,7 +168,7 @@ void LYR75_finished (qk_tap_dance_state_t *state, void *user_data) {
   LYR75tap_state.state = cur_dance(state);
   switch (LYR75tap_state.state) {
 	case SINGLE_TAP: register_code(KC_PSLS); break;
-	case DOUBLE_TAP: set_single_persistent_default_layer(GK75); break;
+	case DOUBLE_TAP: set_single_persistent_default_layer(_GK); break;
     case DOUBLE_SINGLE_TAP: register_code(KC_PSLS); unregister_code(KC_PSLS); register_code(KC_PSLS);
   }
 }
@@ -176,7 +176,7 @@ void LYR75_finished (qk_tap_dance_state_t *state, void *user_data) {
 void LYR75_reset (qk_tap_dance_state_t *state, void *user_data) {
   switch (LYR75tap_state.state) {
     case SINGLE_TAP: unregister_code(KC_PSLS); break;
-    case DOUBLE_TAP: set_single_persistent_default_layer(GK75); break;
+    case DOUBLE_TAP: set_single_persistent_default_layer(_GK); break;
     case DOUBLE_SINGLE_TAP: unregister_code(KC_PSLS);
   }
   LYR75tap_state.state = 0;
diff --git a/users/wanleg/wanleg.c b/users/wanleg/wanleg.c
index 4e60c422fa..274c74f728 100644
--- a/users/wanleg/wanleg.c
+++ b/users/wanleg/wanleg.c
@@ -29,18 +29,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       }
       return false;
       break;
-    case QWERTY75:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(QW75);
-      }
-      return false;
-      break;
-    case GHERKIN75:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(GK75);
-      }
-      return false;
-      break;
     case NUMPAD:
     if (record->event.pressed) {
       set_single_persistent_default_layer(PAD);
@@ -117,51 +105,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       }
       return false;
       break;
-	case SUBTER75:
-      if (record->event.pressed) {
-        layer_on(SUB75);
-      } else {
-        layer_off(SUB75);
-      }
-      return false;
-      break;
-	case SUPRA75:
-      if (record->event.pressed) {
-        layer_on(SUP75);
-      } else {
-        layer_off(SUP75);
-      }
-      return false;
-      break;
-	case NUMBER75:
-      if (record->event.pressed) {
-        layer_on(NUM75);
-      } else {
-        layer_off(NUM75);
-      }
-      return false;
-      break;
-	case DIRECTION75:
-      if (record->event.pressed) {
-        layer_on(DIR75);
-      } else {
-        layer_off(DIR75);
-      }
-      return false;
-      break;
-	case ETCETERA75:
-      if (record->event.pressed) {
-        layer_on(ETC75);
-      } else {
-        layer_off(ETC75);
-      }
-      return false;
-      break;
-	case FUNCTION75:
+	case FUNCTION:
       if (record->event.pressed) {
-        layer_on(FN75);
+        layer_on(_FN);
       } else {
-        layer_off(FN75);
+        layer_off(_FN);
       }
       return false;
       break;
diff --git a/users/wanleg/wanleg.h b/users/wanleg/wanleg.h
index c2644cd6c4..9d07760a7b 100644
--- a/users/wanleg/wanleg.h
+++ b/users/wanleg/wanleg.h
@@ -11,72 +11,33 @@ enum userspace_layers {
   gETC,
   _GK,
   _QW,
-  QW75,
-  GK75,
   ONE,
   SUB,
   SUP,
   NUM,
   DIR,
   ETC,
-  SUB75,
-  SUP75,
-  NUM75,
-  DIR75,
-  ETC75,
-  FN75,
+  _FN,
   PAD,
   GK50,
 };
-#elif KEYBOARD_xd75
+#elif KEYBOARD_40percentclub_5x5
 enum userspace_layers {
-  GK75 = 0,
-  QW75,
-  SUB75,
-  SUP75,
-  NUM75,
-  DIR75,
-  ETC75,
-  FN75,
-  gGK,
+  GK50 = 0,
   _GK,
   _QW,
   PAD,
-  ONE,
-  SUB,
-  SUP,
-  NUM,
-  DIR,
-  ETC,
-  gNUM,
-  gDIR,
-  gETC,
-  GK50,
-};
-#elif KEYBOARD_40percentclub_5x5
-enum userspace_layers {
-  GK50 = 0,
   gNUM,
   gDIR,
   gETC,
-  GK75,
-  QW75,
-  SUB75,
-  SUP75,
-  NUM75,
-  DIR75,
-  ETC75,
-  FN75,
-  PAD,
   gGK,
-  _GK,
-  _QW,
   ONE,
   SUB,
   SUP,
   NUM,
   DIR,
   ETC,
+  _FN,
 };
 #else
   enum userspace_layers {
@@ -93,14 +54,7 @@ enum userspace_layers {
   gNUM,
   gDIR,
   gETC,
-  QW75,
-  GK75,
-  SUB75,
-  SUP75,
-  NUM75,
-  DIR75,
-  ETC75,
-  FN75,
+  _FN,
   GK50,
 };
 #endif
@@ -109,8 +63,6 @@ enum userspace_custom_keycodes {
   gGHERKIN = SAFE_RANGE,
   GHERKIN,
   QWERTY,
-  QWERTY75,
-  GHERKIN75,
   ONEHAND,
   SUBTER,
   SUPRA,
@@ -120,12 +72,7 @@ enum userspace_custom_keycodes {
   gNUMBER,
   gDIRECTION,
   gETCETERA,
-  SUBTER75,
-  SUPRA75,
-  NUMBER75,
-  DIRECTION75,
-  ETCETERA75,
-  FUNCTION75,
+  FUNCTION,
   NUMPAD,
   GHERKIN50,
 
@@ -215,14 +162,14 @@ enum {
 
 /* Et Cetera
  * .-----------------------------------------------------------------------------------------.
- * |  `     | mUP    |        |        | RESET  | SHIFT  | mScrUp | mScrDn |        |  \     |
+ * |  `     | mUP    |        |        | RESET  | SHIFT  | mScrDn | mScrUp |        |  \     |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | mLeft  | mDown  | mRight |        | SHIFT  | mBtn3  | mBtn1  | mBtn2  |  ;     |  '     |
  * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
  * | Sft//Cp| CAPS   |        |        |        | C-A-D  | mScrL  | mScrR  | ALT    |  DEL   |
  * '-----------------------------------------------------------------------------------------'
  */
-#define _______________Gherkin_ETC_0_______________			KC_GRV, 		KC_MS_U, _______,_______, RESET,   KC_RSFT, 			KC_WH_U, KC_WH_D, _______, KC_BSLS
+#define _______________Gherkin_ETC_0_______________			KC_GRV, 		KC_MS_U, _______,_______, RESET,   KC_RSFT, 			KC_WH_D, KC_WH_U, _______, KC_BSLS
 #define _______________Gherkin_ETC_1_______________			KC_MS_L, 		KC_MS_D, KC_MS_R,_______, KC_LSFT, KC_BTN3, 			KC_BTN1, KC_BTN2, KC_SCLN, KC_QUOT
 #define _______________Gherkin_ETC_2_______________			TD(TD_SFT_CAPS),KC_CAPS, _______,_______, _______, LALT(LCTL(KC_DEL)),	KC_WH_L, KC_WH_R, KC_LALT, KC_DEL