[Keyboard] move Salicylic-acid3's keyboards to salicylic-acid3/ (#15791)

44 files changed, 0 insertions, 2145 deletions

diff --git a/keyboards/naked48/.noci b/keyboards/naked48/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/naked48/.noci
+++ /dev/null
diff --git a/keyboards/naked48/config.h b/keyboards/naked48/config.h
deleted file mode 100644
index fae55d19f7..0000000000
--- a/keyboards/naked48/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2021 Salicylic_Acid
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
diff --git a/keyboards/naked48/info.json b/keyboards/naked48/info.json
deleted file mode 100644
index 8186a6ba5b..0000000000
--- a/keyboards/naked48/info.json
+++ /dev/null
@@ -1,249 +0,0 @@
-{
-    "keyboard_name": "Naked48", 
-    "url": "https://salicylic-acid3.hatenablog.com/", 
-    "maintainer": "Salicylic_acid3", 
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {
-                    "label":"Tab",
-                    "x":0,
-                    "y":0
-                },
-                {
-                    "label":"Q",
-                    "x":1,
-                    "y":0
-                },
-                {
-                    "label":"W",
-                    "x":2,
-                    "y":0
-                },
-                {
-                    "label":"E",
-                    "x":3,
-                    "y":0
-                },
-                {
-                    "label":"R",
-                    "x":4,
-                    "y":0
-                },
-                {
-                    "label":"T",
-                    "x":5,
-                    "y":0
-                },
-                {
-                    "label":"Y",
-                    "x":8,
-                    "y":0
-                },
-                {
-                    "label":"U",
-                    "x":9,
-                    "y":0
-                },
-                {
-                    "label":"I",
-                    "x":10,
-                    "y":0
-                },
-                {
-                    "label":"O",
-                    "x":11,
-                    "y":0
-                },
-                {
-                    "label":"P",
-                    "x":12,
-                    "y":0
-                },
-                {
-                    "label":"Back Space",
-                    "x":13,
-                    "y":0
-                },
-                {
-                    "label":"Esc",
-                    "x":0,
-                    "y":1
-                },
-                {
-                    "label":"A",
-                    "x":1,
-                    "y":1
-                },
-                {
-                    "label":"S",
-                    "x":2,
-                    "y":1
-                },
-                {
-                    "label":"D",
-                    "x":3,
-                    "y":1
-                },
-                {
-                    "label":"F",
-                    "x":4,
-                    "y":1
-                },
-                {
-                    "label":"G",
-                    "x":5,
-                    "y":1
-                },
-                {
-                    "label":"H",
-                    "x":8,
-                    "y":1
-                },
-                {
-                    "label":"J",
-                    "x":9,
-                    "y":1
-                },
-                {
-                    "label":"K",
-                    "x":10,
-                    "y":1
-                },
-                {
-                    "label":"L",
-                    "x":11,
-                    "y":1
-                },
-                {
-                    "label":";",
-                    "x":12,
-                    "y":1
-                },
-                {
-                    "label":"'",
-                    "x":13,
-                    "y":1
-                },
-                {
-                    "label":"Shift",
-                    "x":0,
-                    "y":2
-                },
-                {
-                    "label":"Z",
-                    "x":1,
-                    "y":2
-                },
-                {
-                    "label":"X",
-                    "x":2,
-                    "y":2
-                },
-                {
-                    "label":"C",
-                    "x":3,
-                    "y":2
-                },
-                {
-                    "label":"V",
-                    "x":4,
-                    "y":2
-                },
-                {
-                    "label":"B",
-                    "x":5,
-                    "y":2
-                },
-                {
-                    "label":"N",
-                    "x":8,
-                    "y":2
-                },
-                {
-                    "label":"M",
-                    "x":9,
-                    "y":2
-                },
-                {
-                    "label":",",
-                    "x":10,
-                    "y":2
-                },
-                {
-                    "label":".",
-                    "x":11,
-                    "y":2
-                },
-                {
-                    "label":"/",
-                    "x":12,
-                    "y":2
-                },
-                {
-                    "label":"Enter",
-                    "x":13,
-                    "y":2
-                },
-                {
-                    "label":"Adjust",
-                    "x":1,
-                    "y":3
-                },
-                {
-                    "label":"Ctrl",
-                    "x":2,
-                    "y":3
-                },
-                {
-                    "label":"Alt",
-                    "x":3,
-                    "y":3
-                },
-                {
-                    "label":"GUI",
-                    "x":4,
-                    "y":3
-                },
-                {
-                    "label":"&dArr;",
-                    "x":5,
-                    "y":3
-                },
-                {
-                    "x":6,
-                    "y":3
-                },
-                {
-                    "x":7,
-                    "y":3
-                },
-                {
-                    "label":"&uArr;",
-                    "x":8,
-                    "y":3
-                },
-                {
-                    "label":"&larr;",
-                    "x":9,
-                    "y":3
-                },
-                {
-                    "label":"&darr;",
-                    "x":10,
-                    "y":3
-                },
-                {
-                    "label":"&uarr;",
-                    "x":11,
-                    "y":3
-                },
-                {
-                    "label":"&rarr;",
-                    "x":12,
-                    "y":3
-                }
-            ]
-        }
-    }
-}
diff --git a/keyboards/naked48/keymaps/default/config.h b/keyboards/naked48/keymaps/default/config.h
deleted file mode 100644
index 0e452bdb4a..0000000000
--- a/keyboards/naked48/keymaps/default/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2018 Salicylic_acid3
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Select hand configuration */
-
-//#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-//#define USE_SERIAL
-
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 180
diff --git a/keyboards/naked48/keymaps/default/keymap.c b/keyboards/naked48/keymaps/default/keymap.c
deleted file mode 100644
index e145c02e32..0000000000
--- a/keyboards/naked48/keymaps/default/keymap.c
+++ /dev/null
@@ -1,106 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
-  _QWERTY = 0,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.
-       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_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-           MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-
-  [_LOWER] = LAYOUT(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.
-      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_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,S(KC_NUHS),S(KC_NUBS),_______,_______,_______,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-
-  [_RAISE] = LAYOUT(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.
-      KC_TILD,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  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_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-
-  [_ADJUST] = LAYOUT( /* Base */
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, _______, _______,   RESET,   RESET, _______, _______, _______, _______, _______
-          //`------------------------------------------------------------------------------------------------------------'
-  )
-};
-
-int RGB_current_mode;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  bool result = false;
-  switch (keycode) {
-    #ifdef RGBLIGHT_ENABLE
-      case RGB_MOD:
-          if (record->event.pressed) {
-            rgblight_mode(RGB_current_mode);
-            rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-      case RGB_RST:
-          if (record->event.pressed) {
-            eeconfig_update_rgblight_default();
-            rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
-          }
-        break;
-    #endif
-    default:
-      result = true;
-      break;
-  }
-
-  return result;
-}
diff --git a/keyboards/naked48/keymaps/default/readme.md b/keyboards/naked48/keymaps/default/readme.md
deleted file mode 100644
index a28ad8c52c..0000000000
--- a/keyboards/naked48/keymaps/default/readme.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# The default keymap for naked48
-
-## 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|  BSPC|
-|  ESC |     A|     S|     D|     F|     G|      |      |     H|     J|     K|     L|     ;|     '|
-| LSFT |     Z|     X|     C|     V|     B|      |      |     N|     M|     ,|     .|     /|   ENT|
-|      |ADJUST| LCTRL|  LALT|  LGUI| LOWER|   SPC|   SPC| RAISE|  LEFT|  DOWN|    UP| RIGHT|      |
-
-
-## Lower
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|     ~|     !|     @|     #|     $|     %|      |      |     ^|     &|     *|     (|     )|   DEL|
-|   ESC|    F1|    F2|    F3|    F4|    F5|      |      |    F6|     _|     +|     {|     }|  PIPE|
-|  LSFT|    F7|    F8|  F9|     F10|   F11|      |      |   F12| SNUHS| SNUBS|     ,|     .|   ENT|
-|      |ADJUST| LCTRL|  LALT|  LGUI| LOWER|   SPC|   SPC| RAISE|  MNXT|  VOLD|  VOLU|  MPLY|      |
-
-
-## Raise
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|     ~|     1|     2|     3|     4|     5|      |      |     6|     7|     8|     9|     0|   DEL|
-|   DEL|    F1|    F2|    F3|    F4|    F5|      |      |    F6|     -|     =|     [|     ]|  BSLS|
-|  LSFT|    F7|    F8|    F9|   F10|   F11|      |      |   F12|  NUHS|  NUBS|     ,|     .|   ENT|
-|      |ADJUST| LCTRL|  LALT|  LGUI| LOWER|   SPC|   SPC| RAISE|  MNXT|  VOLD|  VOLU|  MPLY|      |
-
-
-## Adjust
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |    9   |    10  |   11   |   12   |    13   |    14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:------:|:------:|:------:|:------:|:-------:|:------:|
-|     ~| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | RGB_RST|   XXXXX|   XXXXX|   XXXXX|    XXXXX|     DEL|
-|   ESC| 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|
-|      |ADJUST| LCTRL|  LALT|  LGUI| LOWER| RESET| RESET|   RAISE|    MNXT|    VOLD|    VOLU|     MPLY|        |
-
diff --git a/keyboards/naked48/keymaps/default/rules.mk b/keyboards/naked48/keymaps/default/rules.mk
deleted file mode 100644
index d29d9074a0..0000000000
--- a/keyboards/naked48/keymaps/default/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SPLIT_KEYBOARD = no
diff --git a/keyboards/naked48/keymaps/default_with_nafuda/config.h b/keyboards/naked48/keymaps/default_with_nafuda/config.h
deleted file mode 100644
index 314fe55c30..0000000000
--- a/keyboards/naked48/keymaps/default_with_nafuda/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2018 Salicylic_acid3
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-#define USE_SERIAL_PD2
-
-#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
deleted file mode 100644
index f5d0772aa4..0000000000
--- a/keyboards/naked48/keymaps/default_with_nafuda/keymap.c
+++ /dev/null
@@ -1,135 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
-  _QWERTY = 0,
-  _MOUSE,
-  _BROWSER,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-enum custom_keycodes {
-  RGB_RST = SAFE_RANGE
-};
-
-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,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,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-           MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_MOUSE] = 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_BTN1, KC_MS_U, KC_BTN2,
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      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_MS_L, KC_MS_D, KC_MS_R,
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-           MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_BROWSER] = 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,              LCTL(KC_W),
-  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-       KC_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,LCTL(LSFT(KC_T)),KC_WH_U,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,LCTL(LSFT(KC_TAB)), KC_WH_D,LCTL(KC_TAB),
-  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-           MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT
-          //`------------------------------------------------------------------------------------------------------------'
-  ),
-
-  [_LOWER] = LAYOUT_with_nafuda(
-  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-      KC_TI