4 files changed, 2 insertions, 112 deletions
diff --git a/keyboards/yushakobo/quick7/keymaps/default/keymap.c b/keyboards/yushakobo/quick7/keymaps/default/keymap.c
index 547396dc7d..2c6e766f36 100644
--- a/keyboards/yushakobo/quick7/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/quick7/keymaps/default/keymap.c
@@ -29,12 +29,12 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-        KC_MUTE,   MO(_FUNC1), RGB_MOD,
+        KC_MUTE,   MO(_FUNC1), UG_NEXT,
         S(KC_TAB), KC_UP,      KC_TAB,
         KC_LEFT,   KC_DOWN,    KC_RGHT
     ),
     [_FUNC1] = LAYOUT(
-        QK_BOOT, KC_TRNS, RGB_TOG,
+        QK_BOOT, KC_TRNS, UG_TOGG,
         KC_HOME, KC_VOLU, KC_END,
         KC_MPRV, KC_VOLD, KC_MNXT
     )
diff --git a/keyboards/yushakobo/quick7/keymaps/via/keymap.c b/keyboards/yushakobo/quick7/keymaps/via/keymap.c
deleted file mode 100644
index ec9c034ebf..0000000000
--- a/keyboards/yushakobo/quick7/keymaps/via/keymap.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright 2020 yushakobo
- *
- * 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/>.
- */
-#include QMK_KEYBOARD_H
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _FUNC1,
-    _VIA1,
-    _VIA2
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    YUSHAURL = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT(
-        KC_MUTE,   MO(_FUNC1), RGB_MOD,
-        S(KC_TAB), KC_UP,      KC_TAB,
-        KC_LEFT,   KC_DOWN,    KC_RGHT
-    ),
-    [_FUNC1] = LAYOUT(
-        QK_BOOT, KC_TRNS, RGB_TOG,
-        KC_HOME, KC_VOLU, KC_END,
-        KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-    [_VIA1] = LAYOUT(
-        YUSHAURL,XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-    [_VIA2] = LAYOUT(
-        XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case YUSHAURL:
-            if (record->event.pressed) {
-                SEND_STRING("https://yushakobo.jp/\n");
-            }
-            break;
-    }
-    return true;
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { // Left encoder
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    else if (index == 1) { // Right encoder
-        if (clockwise) {
-            rgblight_decrease_hue_noeeprom();
-        } else {
-            rgblight_increase_hue_noeeprom();
-        }
-    }
-    return true;
-}
diff --git a/keyboards/yushakobo/quick7/keymaps/via/readme.md b/keyboards/yushakobo/quick7/keymaps/via/readme.md
deleted file mode 100644
index febed08e14..0000000000
--- a/keyboards/yushakobo/quick7/keymaps/via/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# The default VIA keymap for quick7
-
-#### Rotary Encoder is not configurable through VIA
-
-### Base Layer
-```
-Left Encoder(CW: Vol+, CCW: Vol-)
-Right Encoder(CW: RGB HUE-, CCW: RGB HUE+)
-,----------- --------- ------------,
-|   MUTE    |  Func1  |  RGB MODE  |
- ----------- --------- ------------
-| Shift+Tab |   UP    |    TAB     |
- ----------- --------- ------------
-|   LEFT    |  DOWN   |   RIGHT    |
-`----------- --------- ------------'
-```
-
-### Func1 Layer
-```
-,----------- --------- ------------,
-|   QK_BOOT   |  Func1  | RGB TOGGLE |
- ----------- --------- ------------
-|   HOME    |  VOL+   |    END     |
- ----------- --------- ------------
-| MEDIA <<  |  VOL-   |  MEDIA >>  |
-`----------- --------- ------------'
-```
-\ No newline at end of file
diff --git a/keyboards/yushakobo/quick7/keymaps/via/rules.mk b/keyboards/yushakobo/quick7/keymaps/via/rules.mk
deleted file mode 100644
index 036bd6d1c3..0000000000
--- a/keyboards/yushakobo/quick7/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
-\ No newline at end of file