Merge remote-tracking branch 'origin/master' into develop

4 files changed, 298 insertions, 178 deletions

diff --git a/keyboards/naked64/info.json b/keyboards/naked64/info.json
index 60ac6d7276..17619187d8 100644
--- a/keyboards/naked64/info.json
+++ b/keyboards/naked64/info.json
@@ -1,9 +1,9 @@
 {
-    "keyboard_name": "Naked64", 
-    "url": "https://salicylic-acid3.hatenablog.com/", 
-    "maintainer": "Salicylic_acid3", 
-    "width": 16.5, 
-    "height": 5.25, 
+    "keyboard_name": "Naked64",
+    "url": "https://salicylic-acid3.hatenablog.com/",
+    "maintainer": "Salicylic_acid3",
+    "width": 16.5,
+    "height": 5.25,
     "layouts": {
         "LAYOUT": {
             "layout": [
@@ -72,6 +72,107 @@
                 {"label":"↓", "x":14.5, "y":4},
                 {"label":"→", "x":15.5, "y":4}
             ]
+        },
+        "LAYOUT_with_setta21": {
+            "width": 21.5,
+            "height": 6.25,
+            "layout": [
+                {"label":"pgup", "x":0.25, "y":0},
+                {"label":"ESC", "x":1.75, "y":0},
+                {"label":"1", "x":2.75, "y":0},
+                {"label":"2", "x":4, "y":0},
+                {"label":"3", "x":5, "y":0},
+                {"label":"4", "x":6, "y":0},
+                {"label":"5", "x":7, "y":0},
+                {"label":"6", "x":9.25, "y":0},
+                {"label":"7", "x":10.25, "y":0},
+                {"label":"8", "x":11.25, "y":0},
+                {"label":"9", "x":12.25, "y":0},
+                {"label":"0", "x":13.5, "y":0},
+                {"label":"-", "x":14.5, "y":0},
+                {"label":"Back Space", "x":15.5, "y":0},
+
+                {"label":"Esc", "x": 17.5, "y":0},
+                {"label":"F2", "x": 18.5, "y":0},
+                {"label":"=", "x": 19.5, "y":0},
+                {"label":"Delete", "x": 20.5, "y":0},
+
+                {"label":"pgdn", "x":0, "y":1},
+                {"label":"Tab", "x":1.25, "y":1, "w":1.5},
+                {"label":"Q", "x":2.75, "y":1},
+                {"label":"W", "x":4, "y":1},
+                {"label":"E", "x":5, "y":1},
+                {"label":"R", "x":6, "y":1},
+                {"label":"T", "x":7, "y":1},
+                {"label":"Y", "x":9.25, "y":1},
+                {"label":"U", "x":10.25, "y":1},
+                {"label":"I", "x":11.25, "y":1},
+                {"label":"O", "x":12.25, "y":1},
+                {"label":"P", "x":13.5, "y":1},
+                {"label":"[", "x":14.5, "y":1},
+                {"label":"]", "x":15.5, "y":1},
+
+                {"label":"Num Lock", "x": 17.5, "y":1.25},
+                {"label":"/", "x": 18.5, "y":1.25},
+                {"label":"*", "x": 19.5, "y":1.25},
+                {"label":"-", "x": 20.5, "y":1.25},
+
+                {"label":"Control", "x":1, "y":2, "w":1.75},
+                {"label":"A", "x":2.75, "y":2},
+                {"label":"S", "x":4, "y":2},
+                {"label":"D", "x":5, "y":2},
+                {"label":"F", "x":6, "y":2},
+                {"label":"G", "x":7, "y":2},
+                {"label":"H", "x":9.25, "y":2},
+                {"label":"J", "x":10.25, "y":2},
+                {"label":"K", "x":11.25, "y":2},
+                {"label":"L", "x":12.25, "y":2},
+                {"label":";", "x":13.5, "y":2},
+                {"label":"'", "x":14.5, "y":2},
+                {"label":"Return", "x":15.5, "y":2},
+
+                {"label":"7", "x": 17.5, "y":2.25},
+                {"label":"8", "x": 18.5, "y":2.25},
+                {"label":"9", "x": 19.5, "y":2.25},
+
+                {"label":"Shift", "x":0.5, "y":3, "w":2.25},
+                {"label":"Z", "x":2.75, "y":3},
+                {"label":"X", "x":4, "y":3},
+                {"label":"C", "x":5, "y":3},
+                {"label":"V", "x":6, "y":3},
+                {"label":"B", "x":7, "y":3},
+                {"label":"N", "x":9.25, "y":3},
+                {"label":"M", "x":10.25, "y":3},
+                {"label":",", "x":11.25, "y":3},
+                {"label":".", "x":12.25, "y":3},
+                {"label":"/", "x":13.5, "y":3},
+                {"label":"↑", "x":14.5, "y":3},
+                {"label":"Shift", "x":15.5, "y":3},
+
+                {"label":"4", "x": 17.5, "y":3.25},
+                {"label":"5", "x": 18.5, "y":3.25},
+                {"label":"6", "x": 19.5, "y":3.25},
+                {"label":"+", "x": 20.5, "y":2.25, "h":2},
+
+                {"label":"Adjust", "x":1.25, "y":4, "w":1.75},
+                {"label":"Alt", "x":3.75, "y":4.25},
+                {"x":4.75, "y":4.25, "w":2.25},
+                {"label":"⇓", "x":7, "y":4.25},
+                {"label":"⇑", "x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25, "w":2},
+                {"label":"GUI", "x":12.25, "y":4.25},
+                {"label":"←", "x":13.5, "y":4},
+                {"label":"↓", "x":14.5, "y":4},
+                {"label":"→", "x":15.5, "y":4},
+
+                {"label":"1", "x": 17.5, "y":4.25},
+                {"label":"2", "x": 18.5, "y":4.25},
+                {"label":"3", "x": 19.5, "y":4.25},
+
+                {"label":"Lower / 0", "x": 17.5, "y":5.25, "w":2},
+                {"label":"Raise / .", "x": 19.5, "y":5.25},
+                {"label":"Enter", "x": 20.5, "y":4.25, "h":2}
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/naked64/keymaps/default_with_setta21/keymap.c b/keyboards/naked64/keymaps/default_with_setta21/keymap.c
index 5e3d8bf642..01039aaecc 100644
--- a/keyboards/naked64/keymaps/default_with_setta21/keymap.c
+++ b/keyboards/naked64/keymaps/default_with_setta21/keymap.c
@@ -30,76 +30,72 @@ enum custom_keycodes {
   SEND_MIN
 };
 
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+#define ADJUST MO(_ADJUST)
+#define LWR_P0 LT(_LOWER, KC_P0)
+#define RSE_DOT LT(_RAISE, KC_PDOT)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_with_setta21( \
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.      |-----------------------------------------------|
-      KC_PGUP,  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_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NLCK, KC_ESC, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      KC_PGDN,  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LCBR, KC_RCBR,                 KC_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-              KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                  KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,  KC_ENT,LT(_RAISE, KC_PDOT),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_UP, KC_RSFT,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-           MO(_ADJUST),          KC_LALT,           KC_SPC,MO(_LOWER),          MO(_RAISE),           KC_SPC, KC_LGUI, KC_LEFT, KC_DOWN,KC_RIGHT  \
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_FLOCK] = LAYOUT_with_setta21( \
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.      |-----------------------------------------------|
-   TG(_FLOCK),  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,       _______,_______,_______,_______,_______,_______, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______,_______,_______,_______,_______, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,       _______,_______,_______,_______,_______,_______, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______,        _______,_______,_______, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               _______,          _______,          _______, _______,               _______,          _______, _______, _______, _______, _______  \
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_LOWER] = LAYOUT_with_setta21( \
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.      |-----------------------------------------------|
-      _______,  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,    MO(_LOWER),XXXXXXX,KC_LEFT,XXXXXXX,XXXXXXX, KC_ESC, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      _______, KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,               KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,  KC_DEL, _______,               KC_DOWN,KC_DOWN,  KC_UP,KC_PSLS,  KC_F2, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-               _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                 KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______,    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),_______,_______,KC_VOLU,_______,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               _______,          _______,          _______, _______,               _______,          _______, _______, KC_MNXT, KC_VOLD, KC_MPLY  \
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_RAISE] = LAYOUT_with_setta21( \
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.      |------------------------------------------------|
-      _______,  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_F11,  KC_F4,  KC_F7,SEND_MIN, KC_ESC, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+--------+-------|
-      _______,  KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                  KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS, KC_BSPC,                KC_F12,  KC_F5,  KC_F8,SEND_MAX,  KC_F2, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+--------+-------|
-               _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                 KC_F6, KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______,       _______,  KC_F3,  KC_F6,  KC_F9,SEND_CIF, KC_EQL, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+--------+-------|
-               _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, _______,               KC_RPRN,       SEND_SUM,SEND_AVE, KC_DEL, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |------------------------------------------------|
-               _______,          _______,          _______, _______,               _______,          _______, _______, _______, _______, _______  \
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_ADJUST] = LAYOUT_with_setta21( /* Base */
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.      |-----------------------------------------------|
-   TG(_FLOCK),   RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                 KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       _______,RGB_VAD,RGB_HUD,RGB_SAD,XXXXXXX,_______, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,               RGB_VAI,RGB_HUI,RGB_SAI,XXXXXXX,_______, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-               _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,XXXXXXX, _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX,               RGB_MOD,        RGB_TOG,_______,_______, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               _______,          _______,          _______, _______,               _______,          _______, _______, _______, _______, _______ 
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  )
+    /*
+     * ,---.    ,-----------------------.   ,---------------------------.   ,---------------.
+     * |PUp|    |Esc| 1 | 2 | 3 | 4 | 5 |   | 6 | 7 | 8 | 9 | 0 | - |Bsp|   |Esc|F2 | = |Del|
+     * |---|  ,-------------------------|   |---------------------------|   |---------------|
+     * |PDn|  | Tab | Q | W | E | R | T |   | Y | U | I | O | P | [ | ] |   |NLk| / | * | - |
+     * `---' ,--------------------------|   |---------------------------|   |---------------|
+     *       | Caps | A | S | D | F | G |   | H | J | K | L | ; | ' |Ent|   | 7 | 8 | 9 |   |
+     *      ,---------------------------|   |---------------------------|   |-----------| + |
+     *      | Shift | Z | X | C | V | B |   | N | M | , | . | / |Up |Sft|   | 4 | 5 | 6 |   |
+     *      `---------------------------|   |---------------------------|   |---------------|
+     *        |Adjust| |Alt | Space |Lwr|   |Rse| Space |Win|Lft|Dwn|Rgt|   | 1 | 2 | 3 |   |
+     *        `------'  `---------------'   `---------------------------'   |-----------|Ent|
+     *                                                                      |   0   | . |   |
+     *                                                                      `---------------'
+     */
+    [_QWERTY] = LAYOUT_with_setta21(
+        KC_PGUP,    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_BSPC,    KC_ESC,  KC_F2,   KC_EQL,  KC_DEL,
+        KC_PGDN,    KC_TAB , KC_Q   , KC_W   , KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LCBR, KC_RCBR,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+                    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_P7,   KC_P8,   KC_P9,
+                    KC_LSFT, KC_Z   , KC_X   , KC_C,    KC_V,    KC_B,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+                    ADJUST ,          KC_LALT,          KC_SPC,  LOWER,      RAISE,   KC_SPC,           KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT,    KC_P1,   KC_P2,   KC_P3,
+                                                                                                                                               LWR_P0,           RSE_DOT, KC_PENT
+    ),
+
+    [_FLOCK] = LAYOUT_with_setta21(
+     TG(_FLOCK),    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,      _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______,
+                    _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+                    _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______,
+                    _______,          _______,          _______, _______,    _______, _______,          _______, _______, _______, _______,    _______, _______, _______,
+                                                                                                                                               _______,          _______, _______
+    ),
+
+    [_LOWER] = LAYOUT_with_setta21(
+        _______,    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_ESC,  KC_F2,   KC_EQL,  KC_DEL,
+        _______,    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,    KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_DEL,  _______,    XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS,
+                    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE, _______,    XXXXXXX, KC_UP,   XXXXXXX,
+                    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,     KC_F12,  S(KC_NUHS), S(KC_NUBS), _______, _______, KC_VOLU, _______,    KC_LEFT, KC_DOWN, KC_RGHT, KC_PPLS,
+                    _______,          _______,          _______, _______,    _______, _______,                _______, KC_MNXT, KC_VOLD, KC_MPLY,    XXXXXXX, KC_DOWN, XXXXXXX,
+                                                                                                                                                     LOWER,            RAISE,   KC_PENT
+    ),
+
+    [_RAISE] = LAYOUT_with_setta21(
+        _______,    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_ESC,   KC_F2,    KC_EQL,   KC_DEL,
+        _______,    KC_TAB,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_BSPC,    SEND_MIN, SEND_MAX, SEND_CIF, SEND_AVE,
+                    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, _______,    KC_F7,    KC_F8,    KC_F9,
+                    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,     KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______, _______,    KC_F4,    KC_F5,    KC_F6,    SEND_SUM,
+                    _______,          _______,          _______, _______,    _______,          _______, _______, _______, _______, _______,    KC_F11,   KC_F12,   KC_F3,
+                                                                                                                                               _______,            _______,  KC_RPRN
+    ),
+
+    [_ADJUST] = LAYOUT_with_setta21( /* Base */
+     TG(_FLOCK),    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_F7,   KC_F8,   KC_F9,       KC_F10,        KC_F11,  KC_F12,     _______, _______, _______, _______,
+        _______,    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX,       XXXXXXX, _______,    XXXXXXX, XXXXXXX, XXXXXXX, _______,
+                    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    RGB_TOG, RGB_MOD, XXXXXXX, LCA(KC_DEL), LALT(KC_PSCR), KC_PSCR, XXXXXXX,    RGB_SAD, RGB_SAI, XXXXXXX,
+                    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI,     RGB_SAD,       RGB_SAI, XXXXXXX,    RGB_HUD, RGB_HUI, XXXXXXX, RGB_TOG,
+                    _______,          _______,          _______, _______,    _______,          _______, _______,     _______,       _______, _______,    RGB_VAD, RGB_VAI, XXXXXXX,
+                                                                                                                                                         _______,          _______, RGB_MOD
+    )
 };
 
 layer_state_t layer_state_set_user(layer_state_t state) {
diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c b/keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c
index 5c2877d9f5..28522c5e9d 100644
--- a/keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c
@@ -42,105 +42,127 @@ qk_tap_dance_action_t tap_dance_actions[] = {
   [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
 };
 
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+#define ADJUST MO(_ADJUST)
+#define LWR_ENT LT(_LOWER,KC_ENT)
+#define RSE_SPC LT(_RAISE,KC_SPC)
+#define LWR_P0 LT(_LOWER, KC_P0)
+#define RSE_DOT LT(_RAISE, KC_PDOT)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_with_setta21( \
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.      |-----------------------------------------------|
-   TG(_MOUSE),TD(TD_ESFL), KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                  KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, KC_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NLCK, KC_ESC, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
- TG(_BROWSER),  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC, JP_RBRC,                 KC_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-              KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                  KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT,LT(_RAISE, KC_PDOT),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, JP_COMM,  JP_DOT, JP_SLSH,   KC_UP, KC_RSFT,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               KC_ZKHK,  LGUI_T(KC_MHEN),LT(_LOWER,KC_ENT), KC_BSPC,                KC_DEL,LT(_RAISE,KC_SPC),ALT_T(KC_HENK),KC_LEFT,KC_DOWN,KC_RIGHT \
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_MOUSE] = LAYOUT_with_setta21( \
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.      |-----------------------------------------------|
-   TG(_MOUSE), _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,       _______,_______,_______,_______,_______,_______, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      XXXXXXX, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______,_______,_______,_______,_______, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,       _______,_______,_______,_______,_______,_______, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2,               _______,        _______,_______,_______, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               _______,          _______,          _______, _______,               _______,          _______, _______, KC_MS_L, KC_MS_D, KC_MS_R  \
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_BROWSER] = LAYOUT_with_setta21( \
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.      |-----------------------------------------------|
-      XXXXXXX, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,       _______,_______,_______,_______,_______,_______, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
- TG(_BROWSER), _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, KC_PGUP,               _______,_______,_______,_______,_______, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, KC_PGDN,       _______,_______,_______,_______,_______,_______, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______,LCTL(LSFT(KC_T)),KC_UP,LCTL(KC_W),        _______,        _______,_______,_______, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               _______,          _______,          _______, _______,               _______,          _______, _______,LCTL(LSFT(KC_TAB)),KC_DOWN,LCTL(KC_TAB) \
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_FLOCK] = LAYOUT_with_setta21( \
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.      |-----------------------------------------------|
-      _______,TD(TD_ESQW),KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                 KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       _______,_______,_______,_______,_______,_______, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______,_______,_______,_______,_______, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,       _______,_______,_______,_______,_______,_______, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______,        _______,_______,_______, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               _______,          _______,          _______, _______,               _______,          _______, _______, _______, _______, _______  \
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_LOWER] = LAYOUT_with_setta21( \
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.      |-----------------------------------------------|
-      _______,  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,    MO(_LOWER),XXXXXXX,KC_LEFT,XXXXXXX,XXXXXXX, KC_ESC, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      _______, JP_QUOT, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,                 KC_P6,   KC_P7,   KC_P8,   KC_P9, JP_ASTR, JP_SLSH, XXXXXXX,               KC_DOWN,KC_DOWN,  KC_UP,KC_PSLS,  KC_F2, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-               JP_QUOT, JP_HASH,  JP_DQT, JP_LPRN, JP_RPRN,   JP_AT,               XXXXXXX,   KC_P4,   KC_P5,   KC_P6, JP_MINS,  JP_EQL,  KC_ENT,    MO(_RAISE),XXXXXXX,KC_RIGHT,XXXXXXX,KC_PAST,KC_EQL, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                 KC_P0,   KC_P1,   KC_P2,   KC_P3, JP_PLUS,   KC_UP, KC_RSFT,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               KC_ZKHK,          _______,       MO(_LOWER), _______,               _______,       MO(_RAISE),  JP_DOT, KC_LEFT, KC_DOWN, KC_RIGHT \
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_RAISE] = LAYOUT_with_setta21( \
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.      |------------------------------------------------|
-      _______,  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_F11,  KC_F4,  KC_F7,SEND_MIN, KC_ESC, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+--------+-------|
-      _______,  KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,               XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX,                KC_F12,  KC_F5,  KC_F8,SEND_MAX,  KC_F2, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+--------+-------|
-        LCTL_T(KC_F11), XXXXXXX,   KC_F2,   KC_F3,   KC_F4,   KC_F5,               XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, XXXXXXX, _______,       _______,  KC_F3,  KC_F6,  KC_F9,SEND_CIF, KC_EQL, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+--------+-------|
-         SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, _______, _______,               KC_RPRN,       SEND_SUM,SEND_AVE, KC_DEL, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |------------------------------------------------|
-               _______,          _______,          _______, _______,               _______,          _______, _______, _______, _______, _______  \
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  ),
-
-
-  [_ADJUST] = LAYOUT_with_setta21( /* Base */
-  //,--------------------------------------------------------------|             |--------------------------------------------------------------.      |-----------------------------------------------|
-      _______,   RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                 KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       _______,RGB_VAD,RGB_HUD,RGB_SAD,XXXXXXX,_______, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,               RGB_VAI,RGB_HUI,RGB_SAI,XXXXXXX,_______, \
-  //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-               _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,XXXXXXX, _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, XXXXXXX,               RGB_MOD,        RGB_TOG,_______,_______, \
-  //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|      |-----------------------------------------------|
-               _______,          _______,          _______, _______,               _______,          _______, _______, _______, _______, _______  \
-          //`-----------------------------------------------------------------------------------------------------------------------------------'
-  )
+    [_QWERTY] = LAYOUT_with_setta21(
+    //,--------------------------------------------------------------|             |--------------------------------------------------------------.             ,-----------------------------------.
+     TG(_MOUSE),TD(TD_ESFL), KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                  KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, KC_BSPC,              KC_ESC,   KC_F2,   KC_EQL,  KC_DEL,
+    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
+   TG(_BROWSER),  KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC, JP_RBRC,              KC_NLCK,  KC_PSLS, KC_PAST, KC_PMNS,
+    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
+                KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                  KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT,              KC_P7,    KC_P8,   KC_P9,
+    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------|        |
+                 KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH,   KC_UP, KC_RSFT,              KC_P4,    KC_P5,   KC_P6,   KC_PPLS,
+    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
+                 KC_ZKHK,  LGUI_T(KC_MHEN), LWR_ENT, KC_BSPC,                         KC_DEL ,RSE_SPC,   ALT_T(KC_HENK), KC_LEFT, KC_DOWN, KC_RGHT,              KC_P1,    KC_P2,   KC_P3,
+              //`---------------------------------------------------------------------------------------------------------------------------------'             |-----------------+--------|        |
+                                                                                                                                                                 LWR_P0,            RSE_DOT, KC_PENT
+              //                                                                                                                                                `-----------------------------------'
+    ),
+
+    [_MOUSE] = LAYOUT_with_setta21(
+    //,--------------------------------------------------------------|             |--------------------------------------------------------------.             ,-----------------------------------.
+     TG(_MOUSE), _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______,
+    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
+        XXXXXXX, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______,
+    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
+                 _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______,
+    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------|        |
+                 _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2,               _______, _______, _______, _______,
+    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------|
+                 _______,          _______,          _______, _______,               _______, _______,          _______, KC_MS_L, KC_MS_D, KC_MS_R,               _______, _______, _______,
+            //`-----------------------------------------------------------------------------------------------------------------------------------'             |-----------------+--------|        |
+                                                                                                                                                                  _______,          _______, _______
+            //                                                                                                                                                  `-----------------------------------'
+    ),
+
+    [_BROWSER] = LAYOUT_with_setta21(
+    //,--------------------------------------------------------------|             |---------------------------------------------------------------------.             ,-----------------------------------.
+        XXXXXXX, _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______,      _______, _______,                 _______, _______, _______, _______,
+    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+-------------+----------|             |--------+--------+--------+--------|
+   TG(_BROWSER), _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______,      _______, KC_PGUP,                 _______, _______, _______, _______,
+    //|--------+--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+-------------+----------|             |--------+--------+--------+--------|
+                 _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, _______,      _______, KC_PGDN,                 _______, _______, _______,
+    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+-------------+--------+----------|             |--------+--------+--------|        |
+                 _______, _______, _______, _______, _______, _______,               _______, _______, _______, _______, C(S(KC_T)),   KC_UP  , C(KC_W),                 _______, _______, _______, _______,
+    //         |--------+--------+--------+--------+--------+--------|             |--------+--------+--------+--------+--------+--------+----------|                  |--------+--------+--------+--------|
+                 _______,          _______,          _______, _______,               _______, _______,          _______, C(S(KC_TAB)), KC_DOWN, C(KC_TAB),               _______, _______, _______,
+            //`-----------------------------------------------------------------------------------------------------------------------------------'                    |-----------------+--------|        |
+                                                                                                                                                                         _______,          _______, _______
+            //                                                                                                                                                         `-----------------------------------'
+    ),
+
+    [_FLOCK] = LAYOUT_with_setta21(
+    //,--------