[Keyboard] Naked48/60 Configurator bugfix (#7131)

Support for QMK configurator of keyboard Naked48 / 60.
Related: Pull request to configurator
[Keyboard] Add keyboard Naked48 / 60 # 549

24 files changed, 147 insertions, 223 deletions

diff --git a/keyboards/naked48/keymaps/default/config.h b/keyboards/naked48/keymaps/default/config.h
index a568a5f128..0e452bdb4a 100644
--- a/keyboards/naked48/keymaps/default/config.h
+++ b/keyboards/naked48/keymaps/default/config.h
@@ -26,5 +26,3 @@
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
-
-#define RGBLED_NUM 48    // Number of LEDs
\ No newline at end of file
diff --git a/keyboards/naked48/keymaps/default/keymap.c b/keyboards/naked48/keymaps/default/keymap.c
index 91c61b5f43..686685e263 100644
--- a/keyboards/naked48/keymaps/default/keymap.c
+++ b/keyboards/naked48/keymaps/default/keymap.c
@@ -24,10 +24,6 @@ enum custom_keycodes {
   RGB_RST = SAFE_RANGE
 };
 
-// Layer Mode aliases
-#define KC_SNUBS S(KC_NUBS)
-#define KC_SNUHS S(KC_NUHS)
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT(
   //,-----------------------------------------------------|                 |-----------------------------------------------------.
@@ -48,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12,KC_SNUHS,KC_SNUBS, _______, _______, _______,
+      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
                _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
           //`------------------------------------------------------------------------------------------------------------'
diff --git a/keyboards/naked48/keymaps/default_with_nafuda/config.h b/keyboards/naked48/keymaps/default_with_nafuda/config.h
index 264ad08776..314fe55c30 100644
--- a/keyboards/naked48/keymaps/default_with_nafuda/config.h
+++ b/keyboards/naked48/keymaps/default_with_nafuda/config.h
@@ -26,6 +26,10 @@
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
 
+#ifdef RGBLED_NUM
+  #undef RGBLED_NUM
+#endif
+
 #define RGBLED_NUM 55    // Number of LEDs
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 48, 7 }
diff --git a/keyboards/naked48/keymaps/default_with_nafuda/keymap.c b/keyboards/naked48/keymaps/default_with_nafuda/keymap.c
index e4b616e70c..f5d0772aa4 100644
--- a/keyboards/naked48/keymaps/default_with_nafuda/keymap.c
+++ b/keyboards/naked48/keymaps/default_with_nafuda/keymap.c
@@ -26,18 +26,12 @@ enum custom_keycodes {
   RGB_RST = SAFE_RANGE
 };
 
-// Fillers to make layering more clear
-#define KC_SNUBS S(KC_NUBS)
-#define KC_SNUHS S(KC_NUHS)
-
-#define KC_BSAD LT(_ADJUST, KC_BSPC)
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_with_nafuda(
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,              TG(_MOUSE),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-       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_BSAD,   KC_UP,TG(_BROWSER),
+       KC_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,        KC_LEFT, KC_DOWN,KC_RIGHT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
@@ -73,9 +67,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
       KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                   KC_CIRC, KC_AMPR,  KC_ASTR,KC_LPRN, KC_RPRN,  KC_DEL,               TG(_MOUSE),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-       KC_DEL,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,        KC_BSAD,   KC_UP,TG(_MOUSE),
+       KC_DEL,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,LT(_ADJUST, KC_BSPC),KC_UP,TG(_MOUSE),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12,KC_SNUHS,KC_SNUBS, _______, _______, _______,        KC_LEFT, KC_DOWN,KC_RIGHT,
+      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______,       KC_LEFT, KC_DOWN,KC_RIGHT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
                _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
           //`------------------------------------------------------------------------------------------------------------'
@@ -85,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
       KC_TILD,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL,               TG(_MOUSE),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-       KC_DEL,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6, KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,        KC_BSAD,   KC_UP,TG(_MOUSE),
+       KC_DEL,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6, KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,LT(_ADJUST, KC_BSPC),KC_UP,TG(_MOUSE),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______,        KC_LEFT, KC_DOWN,KC_RIGHT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
@@ -95,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_with_nafuda( /* Base */
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                 RGB_VAD,
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                 RGB_VAD,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR, _ADJUST, RGB_SAD, RGB_VAI,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
diff --git a/keyboards/naked48/keymaps/default_with_setta21/config.h b/keyboards/naked48/keymaps/default_with_setta21/config.h
index 1e86c6bb72..2ad4d0adeb 100644
--- a/keyboards/naked48/keymaps/default_with_setta21/config.h
+++ b/keyboards/naked48/keymaps/default_with_setta21/config.h
@@ -26,6 +26,10 @@
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
 
+#ifdef RGBLED_NUM
+  #undef RGBLED_NUM
+#endif
+
 #define RGBLED_NUM 69    // Number of LEDs
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 48, 21 }
diff --git a/keyboards/naked48/keymaps/default_with_setta21/keymap.c b/keyboards/naked48/keymaps/default_with_setta21/keymap.c
index 26278b79b8..f6e460588c 100644
--- a/keyboards/naked48/keymaps/default_with_setta21/keymap.c
+++ b/keyboards/naked48/keymaps/default_with_setta21/keymap.c
@@ -29,21 +29,14 @@ enum custom_keycodes {
   SEND_MIN
 };
 
-// Fillers to make layering more clear
-#define KC_SNUBS S(KC_NUBS)
-#define KC_SNUHS S(KC_NUHS)
-
-#define KC_RADO LT(_RAISE, KC_PDOT)
-#define KC_LOP0 LT(_LOWER, KC_P0)
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_with_setta21(
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,       KC_LOP0,  KC_P1,  KC_P4,  KC_P7,KC_NLCK, KC_ESC,
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NLCK, KC_ESC,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
        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_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,       KC_RADO,  KC_P3,  KC_P6,  KC_P9,KC_PAST, KC_EQL,
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, KC_EQL,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
            MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER), KC_SPC, KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT,                        KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL
           //`------------------------------------------------------------------------------------------------------------'               |-----------------------------------------------|
@@ -55,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+--------+-------+-------|
        KC_DEL,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,               KC_DOWN,KC_DOWN,   KC_UP,KC_PSLS,  KC_F2,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+--------+-------+-------|
-      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12,KC_SNUHS,KC_SNUBS, _______, _______, _______,    MO(_RAISE),XXXXXXX,KC_RIGHT,XXXXXXX,KC_PAST, KC_EQL,
+      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______,   MO(_RAISE),XXXXXXX,KC_RIGHT,XXXXXXX,KC_PAST, KC_EQL,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+----------------+-------+-------|
                _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,                        KC_PENT,         KC_PPLS,KC_PMNS, KC_DEL
           //`------------------------------------------------------------------------------------------------------------'               |------------------------------------------------|
diff --git a/keyboards/naked48/keymaps/default_with_setta21/readme.md b/keyboards/naked48/keymaps/default_with_setta21/readme.md
index 365219739f..6e2a3441d2 100644
--- a/keyboards/naked48/keymaps/default_with_setta21/readme.md
+++ b/keyboards/naked48/keymaps/default_with_setta21/readme.md
@@ -6,7 +6,7 @@ Add Setta21 maps to the default layout.
 |  1   |  2   |  3   |  4   |
 |:----:|:----:|:----:|:----:|
 |   ESC|    F2|     =|   DEL|
-|Ad+Num|     /|     *|     -|
+|   Num|     /|     *|     -|
 |     7|     8|     9|      |
 |     4|     5|     6|     +|
 |     1|     2|     3|      |
@@ -36,7 +36,7 @@ Add Setta21 maps to the default layout.
 |  1   |  2   |  3   |  4   |
 |:----:|:----:|:----:|:----:|
 |   ESC|    F2|     =|   DEL|
-|ADJUST| XXXXX| XXXXX|     -|
+| XXXXX| XXXXX| XXXXX|     -|
 |LED_SAD|LED_SAI| XXXXX|      |
 |LED_HUD|LED_HUI| XXXXX|     +|
 |LED_VAD|LED_VAI| XXXXX|      |
diff --git a/keyboards/naked48/keymaps/salicylic/config.h b/keyboards/naked48/keymaps/salicylic/config.h
index 5eceec73b0..b6372db3b9 100644
--- a/keyboards/naked48/keymaps/salicylic/config.h
+++ b/keyboards/naked48/keymaps/salicylic/config.h
@@ -21,6 +21,10 @@
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
 
+#ifdef RGBLED_NUM
+  #undef RGBLED_NUM
+#endif
+
 #define DRIVER_LED_TOTAL 48
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/naked48/keymaps/salicylic/keymap.c b/keyboards/naked48/keymaps/salicylic/keymap.c
index 995e8bd298..8b5e15c139 100644
--- a/keyboards/naked48/keymaps/salicylic/keymap.c
+++ b/keyboards/naked48/keymaps/salicylic/keymap.c
@@ -26,12 +26,6 @@ enum custom_keycodes {
   RGB_RST = SAFE_RANGE
 };
 
-// Fillers to make layering more clear
-#define KC_CT11 LCTL_T(KC_F11)
-#define KC_SF12 SFT_T(KC_F12)
-#define KC_LOEN LT(_LOWER, KC_ENT)
-#define KC_RASP LT(_RAISE, KC_SPC)
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT(
   //,-----------------------------------------------------|                 |-----------------------------------------------------.
@@ -41,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC,  KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -63,11 +57,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|                 |-----------------------------------------------------.
        KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      KC_CT11,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,
+LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      KC_SF12,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,
+SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+               _______, _______, _______, KC_MHEN, _______, _______, _______, _______, KC_HENK, _______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -101,7 +95,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             RGB_current_mode = rgblight_config.mode;
           }
         break;
-      case RGBRST:
+      case RGB_RST:
           if (record->event.pressed) {
             eeconfig_update_rgblight_default();
             rgblight_enable();
diff --git a/keyboards/naked48/keymaps/salicylic/readme.md b/keyboards/naked48/keymaps/salicylic/readme.md
index cd5e6e7296..6563bb46ff 100644
--- a/keyboards/naked48/keymaps/salicylic/readme.md
+++ b/keyboards/naked48/keymaps/salicylic/readme.md
@@ -1,46 +1,37 @@
 # The salicylic keymap for naked48
 
-Default
-  //,-----------------------------------------|             |-----------------------------------------.
-        TAB,     Q,     W,     E,     R,     T,                   Y,     U,     I,     O,     P,     [,
-  //|------+------+------+------+------+------|             |------+------+------+------+------+------|
-       LSFT,     A,     S,     D,     F,     G,                   H,     J,     K,     L,     -,     ],
-  //|------+------+------+------+------+------|             |------+------+------+------+------+------|
-      LCTRL,     Z,     X,     C,     V,     B,                   N,     M,     ,,     .,     /,     \,
-  //|------+------+------+------+------+-------|------+-----+-------+-----+------+------+------|
-              LEFT, RIGHT,  LGUI,  MHEN,Low+Ent,  BSPC,  DEL,Rai+SPC, HENK,  LALT,    UP,  DOWN 
-          //`----------------------------------------------------------------------------------'
-
-Lower
-  //,-----------------------------------------|             |-----------------------------------------.
-        ESC,  EXLM, JQUES, JLBRC, JRBRC, JTILD,                   6,     7,     8,     9,     *,     /,
-  //|------+------+------+------+------+------|             |------+------+------+------+------+------|
-      JQUOT,  HASH, JDQUO, JLPRN, JRPRN,   JAT,               XXXXX,     4,     5,     6,     -,     =,
-  //|------+------+------+------+------+------|             |------+------+------+------+------+------|
-       JHAT,  PERC, JAMPR,  SCLN, JCLON, JPIPE,                   0,     1,     2,     3,     +,   ENT,
-  //|------+------+------+------+------+------|------+------+------+------+------+------+------|
-              LEFT, RIGHT,  LGUI,  ZKHK, LOWER,  BSPC,  DEL, RAISE,     0,   DOT,     UP,  DOWN 
-          //`----------------------------------------------------------------------------------'
-
-Raise
-  //,-----------------------------------------|             |-----------------------------------------.
-        ESC,     1,     2,     3,     4,     5,                   6, XXXXX,    UP, XXXXX,  PGUP,  BSPC,
-  //|------+------+------+------+------+------|             |------+------+------+------+------+------|
-   Ctrl F11,    F1,    F2,    F3,    F4,    F5,               XXXXX,  LEFT,  DOWN, RIGHT,  LSFT,   ENT,
-  //|------+------+------+------+------+------|             |------+------+------+------+------+------|
-  Shift F12,    F6,    F7,    F8,    F9,   F10,               XXXXX, XXXXX, XXXXX, XXXXX,  PGDN, XXXXX,
-  //|------+------+------+------+------+------|------+------+------+------+------+------+------|
-              LEFT, RIGHT,  LGUI,  ZKHK, LOWER,  BSPC,  DEL, RAISE,     0,   DOT,     UP,  DOWN
-          //`----------------------------------------------------------------------------------'
-
-Adjust
-  //,-----------------------------------------|             |----------------------------------------------.
-        ESC,     1,     2,     3,     4,     5,                   6,      7,      8,      9,      0,    DEL,
-  //|------+------+------+------+------+------|             |------+-------+-------+-------+-------+-------|
-   Ctrl F11,    F1,    F2,    F3,    F4,    F5,          LED ON/Off,LED MOD,  XXXXX,  C+A+D,Alt+PSCR,  PSCR,
-  //|------+------+------+------+------+------|             |------+-------+-------+-------+-------+-------|
-  Shift F12,    F6,    F7,    F8,    F9,   F10,             LED VAD,LED VAI,LED HUD,LED HUI,LED SAD,LED SAI,
-  //|------+------+------+------+------+------|------+------+------+-------+-------+-------+-------|
-              LEFT, RIGHT,  LGUI,  ZKHK, LOWER,  BSPC,  DEL, RAISE,       0,    DOT,     UP,   DOWN
-          //`--------------------------------------------------------------------------------------'
-  )
\ No newline at end of file
+## Default
+|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
+|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
+|  TAB |     Q|     W|     E|     R|     T|      |      |     Y|     U|     I|     O|     P|     [|
+|LCTRL |     A|     S|     D|     F|     G|      |      |     H|     J|     K|     L|     -|     ]|
+| LSFT |     Z|     X|     C|     V|     B|      |      |     N|     M|     ,|     .|     /|     \|
+|      |  LEFT| RIGHT|  LGUI|  MHEN|LOWER, ENT|BSPC|DEL|RAISE,SPC|HENK|  LALT|  DOWN|    UP|      |
+
+
+## Lower
+|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
+|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
+|   ESC|     !|     ?|     [|     ]|     ~|      |      |     6|     7|     8|     9|     *|     /|
+|     '|     #|     "|     (|     )|     @|      |      | XXXXX|     4|     5|     6|     -|     =|
+|     ^|     %|     &|     ;|     :|  PIPE|      |      |     0|     1|     2|     3|     +|   ENT|
+|      |  LEFT| RIGHT|  LGUI|  ZKHK| LOWER|  BSPC|   DEL| RAISE|  HENK|  LALT|  DOWN|    UP|      |
+
+
+## Raise
+|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
+|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
+|   ESC|     1|     2|     3|     4|     5|      |      |     6| XXXXX|    UP| XXXXX|  PGUP|   DEL|
+|F11,LCTRL| F1|    F2|    F3|    F4|    F5|      |      | XXXXX|  LEFT|  DOWN| RIGHT|  LSFT|   ENT|
+|F12,LSFT|  F6|    F7|    F8|    F9|   F10|      |      | XXXXX| XXXXX| XXXXX| XXXXX|  PGDN| XXXXX|
+|      |  LEFT| RIGHT|  LGUI|  MHEN| LOWER|  BSPC|   DEL| RAISE|  HENK|  LALT|  DOWN|    UP|      |
+
+
+## Adjust
+|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |    9   |    10  |   11   |   12   |    13   |    14  |
+|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:------:|:------:|:------:|:------:|:-------:|:------:|
+|   ESC| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | RGB_RST|   XXXXX|   XXXXX|   XXXXX|    XXXXX|   XXXXX|
+| LCTRL| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | RGB_TOG| RGB_MOD|   XXXXX|   C+A+D| Alt+PSCR|    PSCR|
+|  LSFT| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | RGB_VAD| RGB_VAI| RGB_HUD| RGB_HUI|  RGB_SAD| RGB_SAI|
+|      |  LEFT| RIGHT|  LGUI|  MHEN| LOWER|  BSPC|   DEL|   RAISE|    HENK|    LALT|    DOWN|       UP|        |
+
diff --git a/keyboards/naked48/keymaps/salicylic_with_nafuda/config.h b/keyboards/naked48/keymaps/salicylic_with_nafuda/config.h
index a2ce42ea52..7ce6416010 100644
--- a/keyboards/naked48/keymaps/salicylic_with_nafuda/config.h
+++ b/keyboards/naked48/keymaps/salicylic_with_nafuda/config.h
@@ -27,6 +27,10 @@
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
 
+#ifdef RGBLED_NUM
+  #undef RGBLED_NUM
+#endif
+
 #define RGBLED_NUM 55    // Number of LEDs
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 48, 7 }
diff --git a/keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c
index dbb1797cee..5a99b8c0ad 100644
--- a/keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c
+++ b/keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c
@@ -27,25 +27,16 @@ enum custom_keycodes {
   RGB_RST = SAFE_RANGE
 };
 
-// Fillers to make layering more clear
-#define KC_CT11 LCTL_T(KC_F11)
-#define KC_SF12 SFT_T(KC_F12)
-#define KC_LOEN LT(_LOWER, KC_ENT)
-#define KC_RASP LT(_RAISE, KC_SPC)
-
-#define KC_BSAD LT(_ADJUST, KC_BSPC)
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_with_nafuda(
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,              TG(_MOUSE),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,        KC_BSAD,   KC_UP,TG(_BROWSER),
+     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,        KC_LEFT, KC_DOWN,KC_RIGHT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-               KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC,  KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -57,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,        KC_MS_L, KC_MS_D, KC_MS_R,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-               KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC,  KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -69,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,LCTL(LSFT(KC_TAB)), KC_WH_D,LCTL(KC_TAB),
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-               KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC,  KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
@@ -77,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
        KC_ESC, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,                      KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH,              TG(_MOUSE),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      JP_QUOT, JP_HASH,  JP_DQT, JP_LPRN, JP_RPRN,   JP_AT,                   XXXXXXX,    KC_4,    KC_5,    KC_6, JP_MINS,  JP_EQL,        KC_BSAD,   KC_UP,TG(_BROWSER),
+      JP_QUOT, JP_HASH,  JP_DQT, JP_LPRN, JP_RPRN,   JP_AT,                   XXXXXXX,    KC_4,    KC_5,    KC_6, JP_MINS,  JP_EQL,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                      KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,        KC_LEFT, KC_DOWN,KC_RIGHT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
@@ -89,17 +80,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
        KC_ESC, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,                      KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH,              TG(_MOUSE),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      KC_CT11,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,        KC_BSAD,   KC_UP,TG(_BROWSER),
+LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      KC_SF12,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,        KC_LEFT, KC_DOWN,KC_RIGHT,
+SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,        KC_LEFT, KC_DOWN,KC_RIGHT,
   //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+               _______, _______, _______, KC_MHEN, _______, _______, _______, _______, KC_HENK, _______, _______, _______
           //`------------------------------------------------------------------------------------------------------------'
   ),
 
   [_ADJUST] = LAYOUT_with_nafuda( /* Base */
   //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                 RGB_VAD,
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                 RGB_VAD,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
      KC_LCTRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR, _ADJUST, RGB_SAD, RGB_VAI,
   //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
diff --git a/keyboards/naked48/keymaps/salicylic_with_setta21/config.h b/keyboards/naked48/keymaps/salicylic_with_setta21/config.h
index 1e86c6bb72..2ad4d0adeb 100644
--- a/keyboards/naked48/keymaps/salicylic_with_setta21/config.h
+++ b/keyboards/naked48/keymaps/salicylic_with_setta21/config.h
@@ -26,6 +26,10 @@
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
 
+#ifdef RGBLED_NUM
+  #undef RGBLED_NUM
+#endif
+
 #define RGBLED_NUM 69    // Number of LEDs
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 48, 21 }
diff --git a/keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c b/keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c
index d04b53d7ba..cbe65fe660 100644
--- a/keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c
+++ b/