remove some outdated changes

merge from master
possibly all files needed to make things work
2025-08-21 23:13:00 +00:00 · 2021-02-08 14:48:56 -05:00 · 2021-02-07 21:01:30 -05:00 · 2021-02-07 19:53:50 -05:00 · 2020-05-04 13:19:48 -04:00 · 2020-03-30 14:41:56 +02:00
166 changed files with 1863 additions and 8685 deletions
--- a/common_features.mk
+++ b/common_features.mk
@@ -22,6 +22,11 @@ QUANTUM_SRC += \
    $(QUANTUM_DIR)/keymap_common.c \
    $(QUANTUM_DIR)/keycode_config.c

+KEYBOARD_ENABLE ?= yes
+ifeq ($(strip $(KEYBOARD_ENABLE)), yes)
+    OPT_DEFS += -DKEYBOARD_ENABLE
+endif
+
 ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), yes)
    OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE
    CONSOLE_ENABLE = yes
@@ -600,3 +605,8 @@ endif
 ifeq ($(strip $(JOYSTICK_ENABLE)), digital)
    OPT_DEFS += -DDIGITAL_JOYSTICK_ENABLE
 endif
+
+ifeq ($(strip $(SWITCH_CONTROLLER_ENABLE)), yes)
+    OPT_DEFS += -DSWITCH_CONTROLLER_ENABLE
+    OPT_DEFS += -DGAMEPAD_ENABLE
+endif
--- a/docs/feature_haptic_feedback.md
+++ b/docs/feature_haptic_feedback.md
@@ -39,7 +39,7 @@ Not all keycodes below will work depending on which haptic mechanism you have ch

 First you will need a build a circuit to drive the solenoid through a mosfet as most MCU will not be able to provide the current needed to drive the coil in the solenoid.

-[Wiring diagram provided by Adafruit](https://cdn-shop.adafruit.com/product-files/412/solenoid_driver.pdf)
+[Wiring diagram provided by Adafruit](https://playground.arduino.cc/uploads/Learning/solenoid_driver.pdf)


 | Settings                   | Default              | Description                                           |
--- a/docs/ref_functions.md
+++ b/docs/ref_functions.md
@@ -93,7 +93,7 @@ And to do so, add `reset_keyboard()` to your function or macro, and this will re

 ## Wiping the EEPROM (Persistent Storage)

-If you're having issues with Audio, RGB Underglow, backlighting or keys acting weird, then you can reset the EEPROM (persistent setting storage). To force an EEPROM reset, use the [`EEP_RST` keycode](quantum_keycodes.md) or [Bootmagic](feature_bootmagic.md) functionality. If neither of those are an option, then you can use a custom macro to do so.
+If you're having issues with Audio, RGB Underglow, backlighting or keys acting weird, then you can reset the EEPROM (persistent setting storage).  Bootmagic is one way to do this, but if that isn't enabled, then you can use a custom macro to do so.

 To wipe the EEPROM, run `eeconfig_init()` from your function or macro to reset most of the settings to default.

--- a/drivers/avr/ws2812.c
+++ b/drivers/avr/ws2812.c
@@ -67,27 +67,19 @@ void ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds) {
 #define w_onecycles (((F_CPU / 1000) * w_onepulse + 500000) / 1000000)
 #define w_totalcycles (((F_CPU / 1000) * w_totalperiod + 500000) / 1000000)

-// w1_nops - nops between rising edge and falling edge - low
-#if w_zerocycles >= w_fixedlow
-#    define w1_nops (w_zerocycles - w_fixedlow)
+// w1 - nops between rising edge and falling edge - low
+#define w1 (w_zerocycles - w_fixedlow)
+// w2   nops between fe low and fe high
+#define w2 (w_onecycles - w_fixedhigh - w1)
+// w3   nops to complete loop
+#define w3 (w_totalcycles - w_fixedtotal - w1 - w2)
+
+#if w1 > 0
+#    define w1_nops w1
 #else
 #    define w1_nops 0
 #endif

-// w2_nops - nops between fe low and fe high
-#if w_onecycles >= (w_fixedhigh + w1_nops)
-#    define w2_nops (w_onecycles - w_fixedhigh - w1_nops)
-#else
-#    define w2_nops 0
-#endif
-
-// w3_nops - nops to complete loop
-#if w_totalcycles >= (w_fixedtotal + w1_nops + w2_nops)
-#    define w3_nops (w_totalcycles - w_fixedtotal - w1_nops - w2_nops)
-#else
-#    define w3_nops 0
-#endif
-
 // The only critical timing parameter is the minimum pulse length of the "0"
 // Warn or throw error if this timing can not be met with current F_CPU settings.
 #define w_lowtime ((w1_nops + w_fixedlow) * 1000000) / (F_CPU / 1000)
@@ -98,6 +90,18 @@ void ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds) {
 #    warning "Please consider a higher clockspeed, if possible"
 #endif

+#if w2 > 0
+#    define w2_nops w2
+#else
+#    define w2_nops 0
+#endif
+
+#if w3 > 0
+#    define w3_nops w3
+#else
+#    define w3_nops 0
+#endif
+
 #define w_nop1 "nop      \n\t"
 #define w_nop2 "rjmp .+0 \n\t"
 #define w_nop4 w_nop2 w_nop2
--- a/keyboards/alpine65/config.h
+++ b/keyboards/alpine65/config.h
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define RGB_DI_PIN B15
 #define RGBLED_NUM 68
-#define RGBLIGHT_LIMIT_VAL 200
+#define RGBLIGT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_ANIMATIONS

--- a/keyboards/bastardkb/bastylmini/bastylmini.c
+++ b/keyboards/bastardkb/bastylmini/bastylmini.c
@@ -1,18 +0,0 @@
-/* 
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- *
- * 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 "bastylmini.h"
--- a/keyboards/bastardkb/bastylmini/bastylmini.h
+++ b/keyboards/bastardkb/bastylmini/bastylmini.h
@@ -1,37 +0,0 @@
-/* 
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- *
- * 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 "quantum.h"
-
-#define LAYOUT_split_3x6_3( \
-	k00, k01, k02, k03, k04, k05,			k45, k44, k43, k42, k41, k40, \
-	k10, k11, k12, k13, k14, k15,			k55, k54, k53, k52, k51, k50, \
-	k20, k21, k22, k23, k24, k25,			k65, k64, k63, k62, k61, k60, \
-		       k33, k34, k31,		        k71, k74, k73  \
-)\
-{\
-	{ k00, k01, k02, k03, k04, k05 }, \
-	{ k10, k11, k12, k13, k14, k15 }, \
-	{ k20, k21, k22, k23, k24, k25 }, \
-	{ KC_NO, k31, KC_NO, k33, k34, KC_NO }, \
-	{ k40, k41, k42, k43, k44, k45 }, \
-	{ k50, k51, k52, k53, k54, k55 }, \
-	{ k60, k61, k62, k63, k64, k65 }, \
-	{ KC_NO, k71, KC_NO, k73, k74, KC_NO }, \
-}
--- a/keyboards/bastardkb/bastylmini/config.h
+++ b/keyboards/bastardkb/bastylmini/config.h
@@ -1,47 +0,0 @@
-/* 
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- *
- * 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"
-#define VENDOR_ID 0xA8F8
-#define PRODUCT_ID 0x1828
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Bastard Keyboards
-#define PRODUCT Bastyl Mini
-
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-#define RGBLIGHT_LIMIT_VAL 180
-#define MATRIX_ROW_PINS { B5, F7, F6, B6 }
-#define MATRIX_COL_PINS { B4, E6, C6, B1, B3, B2 }
-
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN D2
-#define RGBLED_NUM 42
-#define RGBLED_SPLIT { 21, 21 }
-#define RGBLIGHT_ANIMATIONS
-
-#define DEBOUNCE 5
-
-#define SOFT_SERIAL_PIN D0
-
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-#define F_SCL 400000L
-#define USB_POLLING_INTERVAL_MS 1
-#define MASTER_RIGHT
--- a/keyboards/bastardkb/bastylmini/info.json
+++ b/keyboards/bastardkb/bastylmini/info.json
@@ -1,55 +0,0 @@
-{
-    "keyboard_name": "Bastyl Mini",
-    "url": "https://www.bastardkb.com",
-    "maintainer": "Quentin Lebastard",
-    "width": 17,
-    "height": 4,
-    "layouts": {
-        "LAYOUT_split_3x6_3": {
-            "layout": [
-                {"label":"L00", "x":0, "y":0},
-                {"label":"L01", "x":1, "y":0},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"L05", "x":5, "y":0},
-                {"label":"R00", "x":11, "y":0},
-                {"label":"R01", "x":12, "y":0},
-                {"label":"R02", "x":13, "y":0},
-                {"label":"R03", "x":14, "y":0},
-                {"label":"R04", "x":15, "y":0},
-                {"label":"R05", "x":16, "y":0},
-                {"label":"L10", "x":0, "y":1},
-                {"label":"L11", "x":1, "y":1},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"L15", "x":5, "y":1},
-                {"label":"R10", "x":11, "y":1},
-                {"label":"R11", "x":12, "y":1},
-                {"label":"R12", "x":13, "y":1},
-                {"label":"R13", "x":14, "y":1},
-                {"label":"R14", "x":15, "y":1},
-                {"label":"R15", "x":16, "y":1},
-                {"label":"L20", "x":0, "y":2},
-                {"label":"L21", "x":1, "y":2},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"L25", "x":5, "y":2},
-                {"label":"R20", "x":11, "y":2},
-                {"label":"R21", "x":12, "y":2},
-                {"label":"R22", "x":13, "y":2},
-                {"label":"R23", "x":14, "y":2},
-                {"label":"R24", "x":15, "y":2},
-                {"label":"R25", "x":16, "y":2},
-                {"label":"L33", "x":5, "y":3},
-                {"label":"L34", "x":6, "y":3},
-                {"label":"L31", "x":7, "y":3},
-                {"label":"R33", "x":9, "y":3},
-                {"label":"R34", "x":10, "y":3},
-                {"label":"R31", "x":11, "y":3}
-            ]
-        }
-    }
-}
--- a/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c
+++ b/keyboards/bastardkb/bastylmini/keymaps/default/keymap.c
@@ -1,70 +0,0 @@
-/* 
- * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
- *
- * 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
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [0] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       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_LCTL,    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_ESC,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, KC_SPC  ,  MO(1),     MO(2), KC_ENT , KC_RALT
-                                      //`--------------------------'  `--------------------------'
-
-  ),
-
-  [1] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, KC_SPC,  _______,     MO(3), KC_ENT, KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [2] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,  KC_SPC,  MO(3),     _______, KC_ENT, KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [3] = LAYOUT_split_3x6_3(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,  KC_SPC, _______,     _______, KC_ENT, KC_RALT
-                                      //`--------------------------'  `--------------------------'
-  )
-};
--- a/keyboards/bastardkb/bastylmini/readme.md
+++ b/keyboards/bastardkb/bastylmini/readme.md
@@ -1,15 +0,0 @@
-# Bastyl Mini
-
-A split, compact ergonomic keyboard.
-
-* Keyboard Maintainer: [BastardKb](https://github.com/Bastardkb/)
-* Hardware Supported: elite-C V4
-* Hardware Availability: [Bastardkb.com](https://bastardkb.com/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make bastardkb/bastylmini:default
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-
-See the [keyboard build instructions](http://docs.bastardkb.com/)
--- a/keyboards/bastardkb/bastylmini/rules.mk
+++ b/keyboards/bastardkb/bastylmini/rules.mk
@@ -1,31 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes            # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes
-TAP_DANCE_ENABLE = no
-LTO_ENABLE = yes
-
-AUDIO_SUPPORTED = no
-RGB_MATRIX_SUPPORTED = no
-RGBLIGHT_SUPPORTED = yes
-
-LAYOUTS = split_3x6_3
--- a/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c
@@ -53,6 +53,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 void rgb_matrix_indicators_user(void) {
  uint8_t layer = get_highest_layer(layer_state);
  switch (layer) {
+    case _QWERTY:
+      rgb_matrix_set_color(10, 0, 0, 0); 
+      break;
    case _FN1_60:
      rgb_matrix_set_color(10, 0, 0, 255); 
      break;
--- a/keyboards/boardsource/the_mark/keymaps/stanrc85/rules.mk
+++ b/keyboards/boardsource/the_mark/keymaps/stanrc85/rules.mk
--- a/keyboards/ck60i/config.h
+++ b/keyboards/ck60i/config.h
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define RGB_DI_PIN B15
 #define RGBLED_NUM 16
-#define RGBLIGHT_LIMIT_VAL 200
+#define RGBLIGT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_ANIMATIONS

--- a/keyboards/durgod/k320/info.json
+++ b/keyboards/durgod/k320/info.json
@@ -457,464 +457,6 @@
                    "y": 5.5
                }
            ]
-        },
-        "LAYOUT_tkl_iso": {
-            "layout": [
-                {
-                    "label": "Esc",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "F1",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "F2",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "F3",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "F4",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "F5",
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "label": "F6",
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "label": "F7",
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "label": "F8",
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "label": "F9",
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "label": "F10",
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "label": "F11",
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "label": "F12",
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "label": "PrtSc",
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "label": "Scroll Lock",
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "label": "Pause",
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "label": "~",
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "label": "!",
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "label": "@",
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "label": "#",
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "label": "$",
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "label": "%",
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "label": "^",
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "label": "&",
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "label": "*",
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "label": "(",
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "label": ")",
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "label": "_",
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "label": "+",
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "label": "Backspace",
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "label": "Insert",
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "label": "Home",
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "label": "PgUp",
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "label": "Tab",
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "Y",
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "U",
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "I",
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "O",
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "P",
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "{",
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "}",
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "label": "Enter",
-                    "x": 13.75,
-                    "y": 2.5,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "label": "Delete",
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "label": "End",
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "label": "PgDn",
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "label": "Caps Lock",
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "H",
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "J",
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "K",
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "L",
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "label": ":",
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "\"",
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "#",
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "label": "Shift",
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "\\",
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "N",
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "M",
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "<",
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "label": ">",
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "?",
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "Shift",
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "label": "\u2191",
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Win",
-                    "x": 1.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "x": 3.75,
-                    "y": 5.5,
-                    "w": 6.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 10,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Fn",
-                    "x": 11.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Menu",
-                    "x": 12.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 13.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "label": "\u2190",
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "label": "\u2193",
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "label": "\u2192",
-                    "x": 17.25,
-                    "y": 5.5
-                }
-            ]
        }
    }
 }
--- a/keyboards/durgod/k320/k320.h
+++ b/keyboards/durgod/k320/k320.h
@@ -42,21 +42,3 @@ void on_all_leds(void);
    { K50,  K51,  K52,  XXX,  XXX,  XXX,  K56,  XXX,  XXX,  XXX,  K5A,  K5B,  K5C,  K5D,  K5E,  K5F },  \
    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K6F }   \
 }
-
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_tkl_iso( \
-      K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,            K0D,  K0E,  K0F,  \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,  \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K4E,      K3D,  K3E,  K3F,  \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,                              \
-      K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,            K4F,        \
-      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,      K5E,  K5F,  K6F   \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F },  \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  XXX,  K1E,  K1F },  \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  XXX,  K2E,  K2F },  \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K3D,  K3E,  K3F },  \
-    { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  XXX,  K4D,  K4E,  K4F },  \
-    { K50,  K51,  K52,  XXX,  XXX,  XXX,  K56,  XXX,  XXX,  XXX,  K5A,  K5B,  K5C,  K5D,  K5E,  K5F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K6F }   \
-}
--- a/keyboards/durgod/k320/keymaps/default_iso/keymap.c
+++ b/keyboards/durgod/k320/keymaps/default_iso/keymap.c
@@ -1,72 +0,0 @@
-/* Copyright 2021 kuenhlee and Don Kjer
- *
- * 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
-
-// Layer shorthand
-enum _layer {
-    _BASE,
-    _FUNC
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BASE: Base Layer (Default Layer)
-   * ,-----------------------------------------------------------.  ,--------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-   * |-----------------------------------------------------------|  |--------------|
-   * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-   * |-----------------------------------------------------------|  |--------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |  | Del| End|PgDn|
-   * |------------------------------------------------------ Ret |  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| #|    |
-   * |-----------------------------------------------------------|        ,----.
-   * |Shift| \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |Ctrl|Gui |Alt |      Space            |Alt | Fn  |App |Ctrl|   |Lft| Dn |Rig |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [_BASE] = LAYOUT_tkl_iso( /* Base Layer */
-      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_PSCR,  KC_SLCK,  KC_PAUS,
-      KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
-      KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_ENT,   KC_DEL,   KC_END,   KC_PGDN,  
-      KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,
-      KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,            KC_UP,
-      KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(_FUNC),KC_APP,   KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-  /* Keymap _FUNC: Function Layer
-   * ,-----------------------------------------------------------.  ,--------------.
-   * |   |Play|Stop|Prev|Next| |Mute|Vol+|Vol-|    | |  |  |  |  |  |    |    |    |
-   * |-----------------------------------------------------------|  |--------------|
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |  |    |    |    |
-   * |-----------------------------------------------------------|  |--------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |  |    |    |    |
-   * |-------------------------------------------------------    |  `--------------'
-   * |       |   |   |   |   |   |   |   |   |   |   |   |  |    |
-   * |-----------------------------------------------------------|        ,----.
-   * |     |  |   |   |   |   |   |   |   |   |   |   |          |        |    |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |    |    |    |                       |    |Func |    |    |   |   |    |    |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [_FUNC] = LAYOUT_tkl_iso( /* Function Layer */
-      _______,  KC_MPLY,  KC_MSTP,  KC_MRWD,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  _______,                _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, 
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,                _______,
-      _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,      _______,  _______,  _______
-  )
-};
-
--- a/keyboards/durgod/k320/keymaps/default_iso/readme.md
+++ b/keyboards/durgod/k320/keymaps/default_iso/readme.md
@@ -1,7 +0,0 @@
-# The ISO keymap for Durgod Taurus K320.
-
-Layer 0 : Standard ISO 88 Keys TKL layout (Windows)
-
-Layer 1 : Media control and Windows lock key
- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
-
--- a/keyboards/durgod/k320/keymaps/default_iso_mac/keymap.c
+++ b/keyboards/durgod/k320/keymaps/default_iso_mac/keymap.c
@@ -1,71 +0,0 @@
-/* Copyright 2021 kuenhlee and Don Kjer
- *
- * 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
-
-// Layer shorthand
-enum _layer {
-    _BASE,
-    _FUNC
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BASE: Base Layer (Default Layer)
-   * ,-----------------------------------------------------------.  ,--------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-   * |-----------------------------------------------------------|  |--------------|
-   * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-   * |-----------------------------------------------------------|  |--------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     |  | Del| End|PgDn|
-   * |------------------------------------------------------ Ret |  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| #|    |
-   * |-----------------------------------------------------------|        ,----.
-   * |Shift| \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |Ctrl|Alt |Gui |      Space            |Alt | Fn  |App |Ctrl|   |Lft| Dn |Rig |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [_BASE] = LAYOUT_tkl_iso( /* Base Layer */
-      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_PSCR,  KC_SLCK,  KC_PAUS,
-      KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
-      KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_ENT,   KC_DEL,   KC_END,   KC_PGDN,
-      KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS, 
-      KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,            KC_UP,
-      KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RALT,  MO(_FUNC),KC_APP,   KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-  ),
-  /* Keymap _FUNC: Function Layer
-   * ,-----------------------------------------------------------.  ,--------------.
-   * |   |Play|Stop|Prev|Next| |Mute|Vol+|Vol-|    | |  |  |  |  |  |    |    |    |
-   * |-----------------------------------------------------------|  |--------------|
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |  |    |    |    |
-   * |-----------------------------------------------------------|  |--------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |  |    |    |    |
-   * |-------------------------------------------------------    |  `--------------'
-   * |       |   |   |   |   |   |   |   |   |   |   |   |  |    |
-   * |-----------------------------------------------------------|        ,----.
-   * |     |  |   |   |   |   |   |   |   |   |   |   |          |        |    |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |    |    |    |                       |    |Func |    |    |   |   |    |    |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [_FUNC] = LAYOUT_tkl_iso( /* Function Layer */
-      _______,  KC_MPLY,  KC_MSTP,  KC_MRWD,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  _______,                _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,  _______,  _______,
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, 
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,                _______,
-      _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,      _______,  _______,  _______
-  )
-};
--- a/keyboards/durgod/k320/keymaps/default_iso_mac/readme.md
+++ b/keyboards/durgod/k320/keymaps/default_iso_mac/readme.md
@@ -1,6 +0,0 @@
-# The ISO (Mac) keymap for Durgod Taurus K320.
-
-Layer 0 : Standard ISO 88 Keys TKL layout (Mac)
-
-Layer 1 : Media control
- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
--- a/keyboards/durgod/k320/rules.mk
+++ b/keyboards/durgod/k320/rules.mk
@@ -24,4 +24,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output

-LAYOUTS = tkl_ansi tkl_iso
+LAYOUTS = tkl_ansi
--- a/keyboards/evolv/config.h
+++ b/keyboards/evolv/config.h
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define RGB_DI_PIN B15
 #define RGBLED_NUM 16
-#define RGBLIGHT_LIMIT_VAL 200
+#define RGBLIGT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_ANIMATIONS

--- a/keyboards/geminate60/chconf.h
+++ b/keyboards/geminate60/chconf.h
@@ -1,21 +0,0 @@
-/* Copyright 2020 Weirdo
- *
- * 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 3 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/>.
- */
-
-// Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303
-// so we need to change resolution and frequency to match.
-#define CH_CFG_ST_RESOLUTION 16
-#define CH_CFG_ST_FREQUENCY 10000
-#include_next "chconf.h"
--- a/keyboards/geminate60/config.h
+++ b/keyboards/geminate60/config.h
@@ -1,52 +0,0 @@
- /* Copyright 2020 Weirdo
-  * 
-  * 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"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7764
-#define PRODUCT_ID 0x676D
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Weirdo
-#define PRODUCT Geminate60
-
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-#define MATRIX_ROW_PINS { A9, A10, B10, B11, B15}
-#define MATRIX_COL_PINS { A8, B14, B13, B12, B1, B0, A7 , A1 , A15, B3, B4, B5, B6, B7, B8}
-#define DIODE_DIRECTION ROW2COL
-#define DEBOUNCE 5
-
-
-
-#define RGB_DI_PIN A6
-#define RGBLED_NUM 1
-//#define RGBLIGHT_DISABLE_KEYCODES
-
-
-
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-
-
--- a/keyboards/geminate60/geminate60.c
+++ b/keyboards/geminate60/geminate60.c
@@ -1,16 +0,0 @@
-  /* Copyright 2020 Weirdo
-  * 
-  * 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 "geminate60.h"
--- a/keyboards/geminate60/geminate60.h
+++ b/keyboards/geminate60/geminate60.h
@@ -1,30 +0,0 @@
-/*
-Copyright 2020 Weirdo
-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 "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014,  \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113,        \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213,        \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313,        \
-	K40, K41, K42,                K46,                K410, K411, K412, K413       ) \
-    { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113      }, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213      }, \
-    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313      }, \
-    {K40, K41, K42,                K46,                K410, K411, K412, K413      } \
-    }
--- a/keyboards/geminate60/halconf.h
+++ b/keyboards/geminate60/halconf.h
@@ -1,524 +0,0 @@
-/*
-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/**
- * @file    templates/halconf.h
- * @brief   HAL configuration header.
- * @details HAL configuration file, this file allows to enable or disable the
- *          various device drivers from your application. You may also use
- *          this file in order to override the device drivers default settings.
- *
- * @addtogroup HAL_CONF
- * @{
- */
-
-#ifndef HALCONF_H
-#    define HALCONF_H
-
-#    define _CHIBIOS_HAL_CONF_
-#    define _CHIBIOS_HAL_CONF_VER_7_0_
-
-#    include "mcuconf.h"
-
-/**
- * @brief   Enables the PAL subsystem.
- */
-#    if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
-#        define HAL_USE_PAL TRUE
-#    endif
-
-/**
- * @brief   Enables the ADC subsystem.
- */
-#    if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#        define HAL_USE_ADC FALSE
-#    endif
-
-/**
- * @brief   Enables the CAN subsystem.
- */
-#    if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
-#        define HAL_USE_CAN FALSE
-#    endif
-
-/**
- * @brief   Enables the cryptographic subsystem.
- */
-#    if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
-#        define HAL_USE_CRY FALSE
-#    endif
-
-/**
- * @brief   Enables the DAC subsystem.
- */
-#    if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
-#        define HAL_USE_DAC TRUE
-#    endif
-
-/**
- * @brief   Enables the GPT subsystem.
- */
-#    if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
-#        define HAL_USE_GPT TRUE
-#    endif
-
-/**
- * @brief   Enables the I2C subsystem.
- */
-#    if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
-#        define HAL_USE_I2C TRUE
-#    endif
-
-/**
- * @brief   Enables the I2S subsystem.
- */
-#    if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
-#        define HAL_USE_I2S FALSE
-#    endif
-
-/**
- * @brief   Enables the ICU subsystem.
- */
-#    if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
-#        define HAL_USE_ICU FALSE
-#    endif
-
-/**
- * @brief   Enables the MAC subsystem.
- */
-#    if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
-#        define HAL_USE_MAC FALSE
-#    endif
-
-/**
- * @brief   Enables the MMC_SPI subsystem.
- */
-#    if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
-#        define HAL_USE_MMC_SPI FALSE
-#    endif
-
-/**
- * @brief   Enables the PWM subsystem.
- */
-#    if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
-#        define HAL_USE_PWM TRUE
-#    endif
-
-/**
- * @brief   Enables the RTC subsystem.
- */
-#    if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
-#        define HAL_USE_RTC FALSE
-#    endif
-
-/**
- * @brief   Enables the SDC subsystem.
- */
-#    if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
-#        define HAL_USE_SDC FALSE
-#    endif
-
-/**
- * @brief   Enables the SERIAL subsystem.
- */
-#    if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#        define HAL_USE_SERIAL FALSE
-#    endif
-
-/**
- * @brief   Enables the SERIAL over USB subsystem.
- */
-#    if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#        define HAL_USE_SERIAL_USB TRUE
-#    endif
-
-/**
- * @brief   Enables the SIO subsystem.
- */
-#    if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
-#        define HAL_USE_SIO FALSE
-#    endif
-
-/**
- * @brief   Enables the SPI subsystem.
- */
-#    if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
-#        define HAL_USE_SPI TRUE
-#    endif
-
-/**
- * @brief   Enables the TRNG subsystem.
- */
-#    if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
-#        define HAL_USE_TRNG FALSE
-#    endif
-
-/**
- * @brief   Enables the UART subsystem.
- */
-#    if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
-#        define HAL_USE_UART FALSE
-#    endif
-
-/**
- * @brief   Enables the USB subsystem.
- */
-#    if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#        define HAL_USE_USB TRUE
-#    endif
-
-/**
- * @brief   Enables the WDG subsystem.
- */
-#    if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
-#        define HAL_USE_WDG FALSE
-#    endif
-
-/**
- * @brief   Enables the WSPI subsystem.
- */
-#    if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
-#        define HAL_USE_WSPI FALSE
-#    endif
-
-/*===========================================================================*/
-/* PAL driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
-#        define PAL_USE_CALLBACKS TRUE
-#    endif
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
-#        define PAL_USE_WAIT TRUE
-#    endif
-
-/*===========================================================================*/
-/* ADC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
-#        define ADC_USE_WAIT TRUE
-#    endif
-
-/**
- * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#        define ADC_USE_MUTUAL_EXCLUSION TRUE
-#    endif
-
-/*===========================================================================*/
-/* CAN driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Sleep mode related APIs inclusion switch.
- */
-#    if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
-#        define CAN_USE_SLEEP_MODE TRUE
-#    endif
-
-/**
- * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
- */
-#    if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
-#        define CAN_ENFORCE_USE_CALLBACKS FALSE
-#    endif
-
-/*===========================================================================*/
-/* CRY driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the SW fall-back of the cryptographic driver.
- * @details When enabled, this option, activates a fall-back software
- *          implementation for algorithms not supported by the underlying
- *          hardware.
- * @note    Fall-back implementations may not be present for all algorithms.
- */
-#    if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
-#        define HAL_CRY_USE_FALLBACK FALSE
-#    endif
-
-/**
- * @brief   Makes the driver forcibly use the fall-back implementations.
- */
-#    if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
-#        define HAL_CRY_ENFORCE_FALLBACK FALSE
-#    endif
-
-/*===========================================================================*/
-/* DAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
-#        define DAC_USE_WAIT TRUE
-#    endif
-
-/**
- * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#        define DAC_USE_MUTUAL_EXCLUSION TRUE
-#    endif
-
-/*===========================================================================*/
-/* I2C driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the mutual exclusion APIs on the I2C bus.
- */
-#    if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#        define I2C_USE_MUTUAL_EXCLUSION TRUE
-#    endif
-
-/*===========================================================================*/
-/* MAC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables the zero-copy API.
- */
-#    if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
-#        define MAC_USE_ZERO_COPY FALSE
-#    endif
-
-/**
- * @brief   Enables an event sources for incoming packets.
- */
-#    if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
-#        define MAC_USE_EVENTS TRUE
-#    endif
-
-/*===========================================================================*/
-/* MMC_SPI driver related settings.                                          */
-/*===========================================================================*/
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- *          This option is recommended also if the SPI driver does not
- *          use a DMA channel and heavily loads the CPU.
- */
-#    if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
-#        define MMC_NICE_WAITING TRUE
-#    endif
-
-/*===========================================================================*/
-/* SDC driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Number of initialization attempts before rejecting the card.
- * @note    Attempts are performed at 10mS intervals.
- */
-#    if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
-#        define SDC_INIT_RETRY 100
-#    endif
-
-/**
- * @brief   Include support for MMC cards.
- * @note    MMC support is not yet implemented so this option must be kept
- *          at @p FALSE.
- */
-#    if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
-#        define SDC_MMC_SUPPORT FALSE
-#    endif
-
-/**
- * @brief   Delays insertions.
- * @details If enabled this options inserts delays into the MMC waiting
- *          routines releasing some extra CPU time for the threads with
- *          lower priority, this may slow down the driver a bit however.
- */
-#    if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
-#        define SDC_NICE_WAITING TRUE
-#    endif
-
-/**
- * @brief   OCR initialization constant for V20 cards.
- */
-#    if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
-#        define SDC_INIT_OCR_V20 0x50FF8000U
-#    endif
-
-/**
- * @brief   OCR initialization constant for non-V20 cards.
- */
-#    if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
-#        define SDC_INIT_OCR 0x80100000U
-#    endif
-
-/*===========================================================================*/
-/* SERIAL driver related settings.                                           */
-/*===========================================================================*/
-
-/**
- * @brief   Default bit rate.
- * @details Configuration parameter, this is the baud rate selected for the
- *          default configuration.
- */
-#    if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
-#        define SERIAL_DEFAULT_BITRATE 38400
-#    endif
-
-/**
- * @brief   Serial buffers size.
- * @details Configuration parameter, you can change the depth of the queue
- *          buffers depending on the requirements of your application.
- * @note    The default is 16 bytes for both the transmission and receive
- *          buffers.
- */
-#    if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#        define SERIAL_BUFFERS_SIZE 16
-#    endif
-
-/*===========================================================================*/
-/* SERIAL_USB driver related setting.                                        */
-/*===========================================================================*/
-
-/**
- * @brief   Serial over USB buffers size.
- * @details Configuration parameter, the buffer size must be a multiple of
- *          the USB data endpoint maximum packet size.
- * @note    The default is 256 bytes for both the transmission and receive
- *          buffers.
- */
-#    if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
-#        define SERIAL_USB_BUFFERS_SIZE 1
-#    endif
-
-/**
- * @brief   Serial over USB number of buffers.
- * @note    The default is 2 buffers.
- */
-#    if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
-#        define SERIAL_USB_BUFFERS_NUMBER 2
-#    endif
-
-/*===========================================================================*/
-/* SPI driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
-#        define SPI_USE_WAIT TRUE
-#    endif
-
-/**
- * @brief   Enables circular transfers APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
-#        define SPI_USE_CIRCULAR FALSE
-#    endif
-
-/**
- * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#        define SPI_USE_MUTUAL_EXCLUSION TRUE
-#    endif
-
-/**
- * @brief   Handling method for SPI CS line.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
-#        define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-#    endif
-
-/*===========================================================================*/
-/* UART driver related settings.                                             */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
-#        define UART_USE_WAIT FALSE
-#    endif
-
-/**
- * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#        define UART_USE_MUTUAL_EXCLUSION FALSE
-#    endif
-
-/*===========================================================================*/
-/* USB driver related settings.                                              */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
-#        define USB_USE_WAIT TRUE
-#    endif
-
-/*===========================================================================*/
-/* WSPI driver related settings.                                             */
-/*===========================================================================*/
-
-/**
- * @brief   Enables synchronous APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
-#        define WSPI_USE_WAIT TRUE
-#    endif
-
-/**
- * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
- * @note    Disabling this option saves both code and data space.
- */
-#    if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#        define WSPI_USE_MUTUAL_EXCLUSION TRUE
-#    endif
-
-#endif /* HALCONF_H */
-
-/** @} */
--- a/keyboards/geminate60/info.json
+++ b/keyboards/geminate60/info.json
@@ -1,79 +0,0 @@
-{
-    "keyboard_name": "geminate60",
-    "url": "",
-    "maintainer": "qmk",
-    "width": 15,
-    "height": 5,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K0", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0},
-                {"label":"K05", "x":5, "y":0},
-                {"label":"K06", "x":6, "y":0},
-                {"label":"K07", "x":7, "y":0},
-                {"label":"K08", "x":8, "y":0},
-                {"label":"K09", "x":9, "y":0},
-                {"label":"K010", "x":10, "y":0},
-                {"label":"K011", "x":11, "y":0},
-                {"label":"K012", "x":12, "y":0},
-                {"label":"K013", "x":13, "y":0},
-                {"label":"K014", "x":14, "y":0},
-                {"label":"K10", "x":0, "y":1, "w":1.5},
-                {"label":"K11", "x":1.5, "y":1},
-                {"label":"K12", "x":2.5, "y":1},
-                {"label":"K13", "x":3.5, "y":1},
-                {"label":"K14", "x":4.5, "y":1},
-                {"label":"K15", "x":5.5, "y":1},
-                {"label":"K16", "x":6.5, "y":1},
-                {"label":"K17", "x":7.5, "y":1},
-                {"label":"K18", "x":8.5, "y":1},
-                {"label":"K19", "x":9.5, "y":1},
-                {"label":"K110", "x":10.5, "y":1},
-                {"label":"K111", "x":11.5, "y":1},
-                {"label":"K112", "x":12.5, "y":1},
-                {"label":"K113", "x":13.5, "y":1, "w":1.5},
-                {"label":"K20", "x":0, "y":2, "w":1.75},
-                {"label":"K21", "x":1.75, "y":2},
-                {"label":"K22", "x":2.75, "y":2},
-                {"label":"K23", "x":3.75, "y":2},
-                {"label":"K24", "x":4.75, "y":2},
-                {"label":"K25", "x":5.75, "y":2},
-                {"label":"K26", "x":6.75, "y":2},
-                {"label":"K27", "x":7.75, "y":2},
-                {"label":"K28", "x":8.75, "y":2},
-                {"label":"K29", "x":9.75, "y":2},
-                {"label":"K210", "x":10.75, "y":2},
-                {"label":"K211", "x":11.75, "y":2},
-                {"label":"K212", "x":12.75, "y":2},
-                {"label":"K213", "x":13.75, "y":2, "w":1.25},
-                {"label":"K30", "x":0, "y":3, "w":1.25},
-                {"label":"K31", "x":1.25, "y":3},
-                {"label":"K32", "x":2.25, "y":3},
-                {"label":"K33", "x":3.25, "y":3},
-                {"label":"K34", "x":4.25, "y":3},
-                {"label":"K35", "x":5.25, "y":3},
-                {"label":"K36", "x":6.25, "y":3},
-                {"label":"K37", "x":7.25, "y":3},
-                {"label":"K38", "x":8.25, "y":3},
-                {"label":"K39", "x":9.25, "y":3},
-                {"label":"K310", "x":10.25, "y":3},
-                {"label":"K311", "x":11.25, "y":3},
-                {"label":"K312", "x":12.25, "y":3, "w":1.75},
-                {"label":"K313", "x":14, "y":3},
-                {"label":"K40", "x":0, "y":4, "w":1.25},
-                {"label":"K41", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46", "x":3.75, "y":4, "w":6.25},
-                {"label":"K410", "x":10, "y":4, "w":1.25},
-                {"label":"K411", "x":11.25, "y":4, "w":1.25},
-                {"label":"K412", "x":12.5, "y":4, "w":1.25},
-                {"label":"K413", "x":13.75, "y":4, "w":1.25}
-            ]
-        }
-    }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
-}
--- a/keyboards/geminate60/keymaps/default/keymap.c
+++ b/keyboards/geminate60/keymaps/default/keymap.c
@@ -1,50 +0,0 @@
- /* Copyright 2020 Weirdo
-  * 
-  * 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
-
-
-// [Keymaps] -----------------------------------------------------------------//
-enum layer_names {
-    _BASE,
-    _FN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        [_BASE] = LAYOUT(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_EQL, KC_BSPC, KC_BSPC,
-                         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-                         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, 
-                         KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
-                         KC_LCTL, KC_LWIN, KC_LALT,KC_SPACE, KC_RALT, KC_RALT, KC_RWIN, KC_RCTL),
-
-
-        [_FN] = LAYOUT(KC_GRV, 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_DEL, KC_DEL,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT),  //
-
-};
-
-bool led_update_user(led_t led_state) {
-
-    if(led_state.caps_lock){
-        rgblight_setrgb_at(192, 192, 192, 0);
-    }else{
-        rgblight_setrgb_at(0, 0, 0, 0);
-    }
-
-    return true;
-}
--- a/keyboards/geminate60/keymaps/via/keymap.c
+++ b/keyboards/geminate60/keymaps/via/keymap.c
@@ -1,58 +0,0 @@
- /* Copyright 2020 Weirdo
-  * 
-  * 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
-
-
-// [Keymaps] -----------------------------------------------------------------//
-enum layer_names { _BASE, _FN ,_FN1 ,_FN2 };
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        [_BASE] = LAYOUT(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_EQL, KC_BSPC, KC_BSPC,
-                         KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-                         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-                         KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
-                         KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE,  KC_RALT, KC_RALT, KC_RWIN, KC_RCTL),
-
-
-        [_FN] = LAYOUT(KC_GRV, 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_DEL, KC_DEL,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT),  //
-
-        [_FN1] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,),
-
-        [_FN2] = LAYOUT(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
-
-bool led_update_user(led_t led_state) {
-
-    if(led_state.caps_lock){
-        rgblight_setrgb_at(192, 192, 192, 0);
-    }else{
-        rgblight_setrgb_at(0, 0, 0, 0);
-    }
-
-    return true;
-}
--- a/keyboards/geminate60/readme.md
+++ b/keyboards/geminate60/readme.md
@@ -1,15 +0,0 @@
-# Geminate60
-
-![Geminate60](https://www.hualigs.cn/image/600d9391f16d7.jpg)
-
-A 60% keyboard based on STM32f303
-
-* Keyboard Maintainer:  [Weirdo](https://weirdo-f.github.io)(https://github.com/1248314361)
-* Hardware Supported: Geminate60
-* Hardware Availability: Not yet
-
-Make example for this keyboard (after setting up your build environment):
-
-    make geminate60:default
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
--- a/keyboards/geminate60/rules.mk
+++ b/keyboards/geminate60/rules.mk
@@ -1,21 +0,0 @@
-# MCU name
-MCU = STM32F303
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
-AUDIO_ENABLE = no           # Audio output
-
-#LAYOUTS = ortho_5x15
--- a/keyboards/handwired/gc_controller/config.h
+++ b/keyboards/handwired/gc_controller/config.h
@@ -0,0 +1,62 @@
+/* Copyright 2019 Jack Humbert
+ *
+ * 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"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x0e6f
+#define PRODUCT_ID      0x0185
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    QMK
+#define PRODUCT         Proton C
+#define DESCRIPTION     Handwired Gamepad
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 1
+
+#define DIODE_DIRECTION COL2ROW
+
+#define MATRIX_COL_PINS { A3 }
+#define MATRIX_ROW_PINS { A1 }
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+#define GAMECUBE_DATA_PIN A2
--- a/keyboards/handwired/gc_controller/gc_controller.c
+++ b/keyboards/handwired/gc_controller/gc_controller.c
@@ -0,0 +1,130 @@
+#include "gc_controller.h"
+#include "gc_read.h"
+#include "gamepad.h"
+#include <string.h>
+
+uint16_t gamecube_buttons = 0;
+uint8_t gamecube_joysticks[6] = {0};
+bool z_button = false;
+
+report_gamepad_t report = {
+    .Button = 0,
+    .LX = STICK_CENTER,
+    .LY = STICK_CENTER,
+    .RX = STICK_CENTER,
+    .RY = STICK_CENTER,
+    .HAT = HAT_CENTER
+};
+
+void board_init(void) {
+    setPinOutput(C13);
+    writePinLow(C13);
+    gamecube_init();
+}
+
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+    gamecube_scan(&gamecube_buttons, gamecube_joysticks);
+
+    z_button = gamecube_buttons & GAMECUBE_Z;
+
+    // Home & Capture
+    if (gamecube_buttons & GAMECUBE_START) {
+        if (z_button && !(report.Button & SWITCH_HOME))
+            report.Button |= SWITCH_CAPTURE;
+        else
+            report.Button |= SWITCH_HOME;
+    } else {
+        report.Button &= ~SWITCH_HOME;
+        report.Button &= ~SWITCH_CAPTURE;
+    }
+    // Y and L
+    if (gamecube_buttons & GAMECUBE_Y) {
+        if (z_button && !(report.Button & SWITCH_Y))
+            report.Button |= SWITCH_L;
+        else
+            report.Button |= SWITCH_Y;
+    } else {
+        report.Button &= ~SWITCH_Y;
+        report.Button &= ~SWITCH_L;
+    }
+    // X and R
+    if (gamecube_buttons & GAMECUBE_X) {
+        if (z_button && !(report.Button & SWITCH_X))
+            report.Button |= SWITCH_R;
+        else
+            report.Button |= SWITCH_X;
+    } else {
+        report.Button &= ~SWITCH_X;
+        report.Button &= ~SWITCH_R;
+    }
+    // B and -
+    if (gamecube_buttons & GAMECUBE_B) {
+        if (z_button && !(report.Button & SWITCH_B))
+            report.Button |= SWITCH_MINUS;
+        else
+            report.Button |= SWITCH_B;
+    } else {
+        report.Button &= ~SWITCH_B;
+        report.Button &= ~SWITCH_MINUS;
+    }
+    // A and +
+    if (gamecube_buttons & GAMECUBE_A) {
+        if (z_button && !(report.Button & SWITCH_A))
+            report.Button |= SWITCH_PLUS;
+        else
+            report.Button |= SWITCH_A;
+    } else {
+        report.Button &= ~SWITCH_A;
+        report.Button &= ~SWITCH_PLUS;
+    }
+
+    if (gamecube_buttons & GAMECUBE_L) {
+        report.Button |= SWITCH_ZL;
+    } else {
+        report.Button &= ~SWITCH_ZL;
+    }
+    if (gamecube_buttons & GAMECUBE_R) {
+        report.Button |= SWITCH_ZR;
+    } else {
+        report.Button &= ~SWITCH_ZR;
+    }
+
+    if ((gamecube_buttons & GAMECUBE_UP) && (gamecube_buttons & GAMECUBE_RIGHT))
+        report.HAT = HAT_TOP_RIGHT;
+    else if ((gamecube_buttons & GAMECUBE_UP) && (gamecube_buttons & GAMECUBE_LEFT))
+        report.HAT = HAT_TOP_LEFT;
+    else if ((gamecube_buttons & GAMECUBE_DOWN) && (gamecube_buttons & GAMECUBE_RIGHT))
+        report.HAT = HAT_BOTTOM_RIGHT;
+    else if ((gamecube_buttons & GAMECUBE_DOWN) && (gamecube_buttons & GAMECUBE_LEFT))
+        report.HAT = HAT_BOTTOM_LEFT;
+    else if (gamecube_buttons & GAMECUBE_UP)
+        report.HAT = HAT_TOP;
+    else if (gamecube_buttons & GAMECUBE_DOWN)
+        report.HAT = HAT_BOTTOM;
+    else if (gamecube_buttons & GAMECUBE_RIGHT)
+        report.HAT = HAT_RIGHT;
+    else if (gamecube_buttons & GAMECUBE_LEFT)
+        report.HAT = HAT_LEFT;
+    else
+        report.HAT = HAT_CENTER;
+
+    if (report.Button || report.HAT != HAT_CENTER)
+        writePinHigh(C13);
+    else
+        writePinLow(C13);
+
+    // joystick calculations
+ 
+    report.LX = gamecube_joysticks[0];         
+    report.LY = 255 - gamecube_joysticks[1];    
+    report.RX = gamecube_joysticks[2];          
+    report.RY = 255 - gamecube_joysticks[3];          
+
+    send_gamepad(&report);
+
+}
--- a/keyboards/handwired/gc_controller/gc_controller.h
+++ b/keyboards/handwired/gc_controller/gc_controller.h
@@ -0,0 +1,47 @@
+#include "quantum.h"
+
+typedef enum {
+    SWITCH_Y       = 0x01,
+    SWITCH_B       = 0x02,
+    SWITCH_A       = 0x04,
+    SWITCH_X       = 0x08,
+    SWITCH_L       = 0x10,
+    SWITCH_R       = 0x20,
+    SWITCH_ZL      = 0x40,
+    SWITCH_ZR      = 0x80,
+    SWITCH_MINUS   = 0x100,
+    SWITCH_PLUS    = 0x200,
+    SWITCH_LCLICK  = 0x400,
+    SWITCH_RCLICK  = 0x800,
+    SWITCH_HOME    = 0x1000,
+    SWITCH_CAPTURE = 0x2000,
+} SwitchButtons_t;
+
+typedef enum {
+    GAMECUBE_A      = 0b0000000000000001,
+    GAMECUBE_B      = 0b0000000000000010,
+    GAMECUBE_X      = 0b0000000000000100,
+    GAMECUBE_Y      = 0b0000000000001000,
+    GAMECUBE_START  = 0b0000000000010000,
+    GAMECUBE_LEFT   = 0b0000000100000000,
+    GAMECUBE_RIGHT  = 0b0000001000000000,
+    GAMECUBE_DOWN   = 0b0000010000000000,
+    GAMECUBE_UP     = 0b0000100000000000,
+    GAMECUBE_Z      = 0b0001000000000000,
+    GAMECUBE_R      = 0b0010000000000000,
+    GAMECUBE_L      = 0b0100000000000000,
+} GamecubeButtons_t;
+
+#define HAT_TOP          0x00
+#define HAT_TOP_RIGHT    0x01
+#define HAT_RIGHT        0x02
+#define HAT_BOTTOM_RIGHT 0x03
+#define HAT_BOTTOM       0x04
+#define HAT_BOTTOM_LEFT  0x05
+#define HAT_LEFT         0x06
+#define HAT_TOP_LEFT     0x07
+#define HAT_CENTER       0x08
+
+#define STICK_MIN      0
+#define STICK_CENTER 128
+#define STICK_MAX    255
--- a/keyboards/handwired/gc_controller/gc_read.c
+++ b/keyboards/handwired/gc_controller/gc_read.c
@@ -0,0 +1,216 @@
+#include "gc_read.h"
+#include "gc_controller.h"
+
+#define CONTROLLER_TIMEOUT 60
+
+bool init_message[9] = {0, 0, 0, 0, 0, 0, 0, 0, 1};
+bool request_message[25] = {
+    0, 1, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 1, 1, 
+    0, 0, 0, 0, 0, 0, 1, 0, 1};
+
+void start_message(void) {
+    setPinOutput(GAMECUBE_DATA_PIN);
+    writePinLow(GAMECUBE_DATA_PIN);
+}
+
+void send_bit(bool b) {
+    if (b) {
+        writePinLow(GAMECUBE_DATA_PIN);
+        wait_ns(900);
+        writePinHigh(GAMECUBE_DATA_PIN);
+        wait_ns(2900);
+    } else {
+        writePinLow(GAMECUBE_DATA_PIN);
+        wait_ns(2900);
+        writePinHigh(GAMECUBE_DATA_PIN);
+        wait_ns(900);
+    }
+}
+
+void wait_for_ready(void) {
+    setPinInputHigh(GAMECUBE_DATA_PIN);
+
+    // wait for long high
+    uint8_t ready = 0;
+    while (ready < 5) {
+        if (readPin(GAMECUBE_DATA_PIN))
+            ready++;
+        else
+            ready = 0;
+        wait_us(1);
+    }
+}
+
+void end_message(void) {
+    setPinInputHigh(GAMECUBE_DATA_PIN);
+}
+
+uint8_t buffer[9] = {0};
+uint16_t buttons_debounce = 0;
+bool initialised = false;
+bool calibrated = false;
+uint8_t mid_values[4] = {128, 128, 128, 128};
+uint8_t max_values[4] = {210, 210, 210, 210};
+uint8_t min_values[4] = {35, 35, 35, 35};
+
+void gamecube_init(void) {
+    setPinInputHigh(GAMECUBE_DATA_PIN);
+}
+
+void gamecube_scan(uint16_t * buttons, uint8_t * joysticks) {
+    bool exiting = false;
+    uint16_t timeout_counter = 0;
+
+    // somehow we're missing the first bit, which can safely be ignored
+    // i'm not sure if it's something with the timing or what
+    uint8_t buffer_bit = 1;
+
+    chSysLock();
+
+    if (!initialised) {
+        wait_for_ready();
+        
+        start_message();
+        for (uint8_t i = 0; i < 9; i++)
+            send_bit(init_message[i]);
+        end_message();
+
+        initialised = true;
+    }
+
+    wait_for_ready();
+
+    start_message();
+    for (uint8_t i = 0; i < 25; i++)
+        send_bit(request_message[i]);
+    end_message();
+
+    while (!exiting) {
+        timeout_counter = 0;
+        // wait for low or timeout
+        while (readPin(GAMECUBE_DATA_PIN)) {
+            wait_ns(100);
+            timeout_counter++;
+            if (timeout_counter > CONTROLLER_TIMEOUT) {
+                exiting = true;
+                break;
+            }
+        }
+
+        if (!exiting) {
+            // wait for the data part
+            wait_ns(1950);
+            bool b = readPin(GAMECUBE_DATA_PIN);
+            if (b)
+                buffer[buffer_bit / 8] |=  (1 << (7 - (buffer_bit % 8)));
+            else
+                buffer[buffer_bit / 8] &= ~(1 << (7 - (buffer_bit % 8)));
+            buffer_bit++;
+
+            // wait for high
+            while (!readPin(GAMECUBE_DATA_PIN));
+        }
+    }
+
+    chSysUnlock();
+
+    // basic debouncing for buttons
+    uint16_t combined_buttons = buffer[0] | (buffer[1] << 8);
+    *buttons |= buttons_debounce & combined_buttons;
+    *buttons &= buttons_debounce | combined_buttons;
+    buttons_debounce = combined_buttons;
+
+   if (!calibrated && mid_values[0] > 0) {
+        mid_values[0] = buffer[2];
+        mid_values[1] = buffer[3];
+        mid_values[2] = buffer[4];
+        mid_values[3] = buffer[5];
+        calibrated = true;
+    }
+
+    if (max_values[0] < buffer[2])
+        max_values[0] = buffer[2];
+    if (max_values[1] < buffer[3])
+        max_values[1] = buffer[3];
+    if (max_values[2] < buffer[4])
+        max_values[2] = buffer[4];
+    if (max_values[3] < buffer[5])
+        max_values[3] = buffer[5];
+
+    if (min_values[0] > buffer[2])
+        min_values[0] = buffer[2];
+    if (min_values[1] > buffer[3])
+        min_values[1] = buffer[3];
+    if (min_values[2] > buffer[4])
+        min_values[2] = buffer[4];
+    if (min_values[3] > buffer[5])
+        min_values[3] = buffer[5];
+
+    // values from my GC controller in Windows
+    // 30 - 138 - 236
+    // 20 - 124 - 225
+    // 37 - 135 - 222
+    // 34 - 126 - 216
+
+    // this should be 127? i don't understand what i'm doing wrong yet
+    #define JOYSTICK_SCALER 180.0
+
+    int32_t lx_temp = (int16_t)buffer[2] - mid_values[0];
+    if (lx_temp > 0)
+        lx_temp *= JOYSTICK_SCALER / (max_values[0]-mid_values[0]);
+    else
+        lx_temp *= JOYSTICK_SCALER / (mid_values[0]-min_values[0]);
+    lx_temp += STICK_CENTER;
+    if (lx_temp > 255)
+        lx_temp = 255;
+    if (lx_temp < 0)
+        lx_temp = 0;
+
+    int32_t ly_temp = (int16_t)buffer[3] - mid_values[1];
+    if (ly_temp > 0)
+        ly_temp *= JOYSTICK_SCALER / (max_values[1]-mid_values[1]);
+    else
+        ly_temp *= JOYSTICK_SCALER / (mid_values[1]-min_values[1]);
+    ly_temp += STICK_CENTER;
+    if (ly_temp > 255)
+        ly_temp = 255;
+    if (ly_temp < 0)
+        ly_temp = 0;
+
+    int32_t rx_temp = (int16_t)buffer[4] - mid_values[2];
+    if (rx_temp > 0)
+        rx_temp *= JOYSTICK_SCALER / (max_values[2]-mid_values[2]);
+    else
+        rx_temp *= JOYSTICK_SCALER / (mid_values[2]-min_values[2]);
+    rx_temp += STICK_CENTER;
+    if (rx_temp > 255)
+        rx_temp = 255;
+    if (rx_temp < 0)
+        rx_temp = 0;
+
+    int32_t ry_temp = (int16_t)buffer[5] - mid_values[3];
+    if (ry_temp > 0)
+        ry_temp *= JOYSTICK_SCALER / (max_values[3]-mid_values[3]);
+    else
+        ry_temp *= JOYSTICK_SCALER / (mid_values[3]-min_values[3]);
+    ry_temp += STICK_CENTER;
+    if (ry_temp > 255)
+        ry_temp = 255;
+    if (ry_temp < 0)
+        ry_temp = 0;
+
+    // checks to avoid a data skip (0 values on input, which aren't possible, i think)
+    if (buffer[2])
+        joysticks[0] = lx_temp;
+    if (buffer[3])
+        joysticks[1] = ly_temp;
+    if (buffer[4])
+        joysticks[2] = rx_temp;
+    if (buffer[5])
+        joysticks[3] = ry_temp;
+    if (buffer[6])
+        joysticks[4] = buffer[6];
+    if (buffer[7])
+        joysticks[5] = buffer[7];
+}
--- a/keyboards/handwired/gc_controller/gc_read.h
+++ b/keyboards/handwired/gc_controller/gc_read.h
@@ -0,0 +1,34 @@
+#include "quantum.h"
+
+/* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */
+
+#ifndef NOP_FUDGE
+#    if defined(STM32F0XX) || defined(STM32F1XX) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX)
+#        define NOP_FUDGE 0.4
+#    else
+#        error("NOP_FUDGE configuration required")
+#        define NOP_FUDGE 1  // this just pleases the compile so the above error is easier to spot
+#    endif
+#endif
+
+#define NUMBER_NOPS 6
+#define CYCLES_PER_SEC (STM32_SYSCLK / NUMBER_NOPS * NOP_FUDGE)
+#define NS_PER_SEC (1000000000L)  // Note that this has to be SIGNED since we want to be able to check for negative values of derivatives
+#define NS_PER_CYCLE (NS_PER_SEC / CYCLES_PER_SEC)
+#define NS_TO_CYCLES(n) ((n) / NS_PER_CYCLE)
+
+#define wait_ns(x)                                  \
+    do {                                            \
+        for (int i = 0; i < NS_TO_CYCLES(x); i++) { \
+            __asm__ volatile("nop\n\t"              \
+                             "nop\n\t"              \
+                             "nop\n\t"              \
+                             "nop\n\t"              \
+                             "nop\n\t"              \
+                             "nop\n\t");            \
+        }                                           \
+    } while (0)
+
+
+void gamecube_init(void);
+void gamecube_scan(uint16_t * buttons, uint8_t * joysticks);
--- a/keyboards/handwired/gc_controller/keymaps/default/keymap.c
+++ b/keyboards/handwired/gc_controller/keymaps/default/keymap.c
@@ -0,0 +1,3 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { { { 0 } } };
--- a/keyboards/handwired/gc_controller/readme.md
+++ b/keyboards/handwired/gc_controller/readme.md
@@ -0,0 +1,12 @@
+
+J1 header
+---------
+
+|#|Color  |Proton C|Description|
+|-|-------|----|------------|
+|1|blue   |3.3V|            |
+|2|yellow |5V  |            |
+|3|red    |A2  |Data (3.3V) |
+|4|green  |GND |            |
+|5|white  |GND |            |
+|6|black  |NC  |            |
--- a/keyboards/handwired/gc_controller/rules.mk
+++ b/keyboards/handwired/gc_controller/rules.mk
@@ -0,0 +1,15 @@
+# MCU name
+MCU = STM32F303
+
+BACKLIGHT_ENABLE = no
+MOUSEKEY_ENABLE = no
+EXTRAKEY_ENABLE = no
+CONSOLE_ENABLE = no
+NKRO_ENABLE = no
+RAW_ENABLE = no
+MIDI_ENABLE = no
+VIRTSER_ENABLE = no
+KEYBOARD_ENABLE = no
+SWITCH_CONTROLLER_ENABLE = yes
+
+SRC += gc_read.c
--- a/keyboards/handwired/onekey/proton_c/config.h
+++ b/keyboards/handwired/onekey/proton_c/config.h
@@ -29,4 +29,4 @@

 #define RGB_DI_PIN A0

-#define ADC_PIN A0
+#define ADC_PIN A1
--- a/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c
+++ b/keyboards/hidtech/bastyl/keymaps/german_gaming/keymap.c
@@ -1,90 +0,0 @@
-/*
- * Copyright 2021 Joschua Gandert
- *
- * 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
-#include "keymap_german.h"
-
-
-enum layer_names {
-    _BASE,
-    _GAME, /* WASD shifted right once  */
-    _LOWER,
-    _RAISE,
-    _ADJUST /* when both LOWER and RAISE pressed */
-};
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-    KC_ESC , KC_1  ,  KC_2  ,  KC_3  , KC_4  , KC_5  ,              KC_6  , KC_7  , KC_8   , KC_9  , KC_0   , DE_SS  ,
-    KC_TAB , KC_Q  ,  KC_W  ,  KC_E  , KC_R  , KC_T  ,              DE_Z  , KC_U  , KC_I   , KC_O  , KC_P   , DE_UDIA,
-    KC_LSFT, KC_A  ,  KC_S  ,  KC_D  , KC_F  , KC_G  ,              KC_H  , KC_J  , KC_K   , KC_L  , DE_ODIA, DE_ADIA,
-    KC_LCTL, DE_Y  ,  KC_X  ,  KC_C  , KC_V  , KC_B  ,              KC_N  , KC_M  , KC_COMM, KC_DOT, DE_MINS, DE_PLUS,
-
-                                  RAISE,  KC_SPC,   KC_LCTL,    KC_RALT,  KC_BSPC,  LOWER,
-                                          KC_ENT,   KC_LALT,    KC_LGUI,  KC_RSFT
-  ),
-
-  [_GAME] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
-    KC_T   , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   ,           _______, _______, KC_UP,   _______, _______, _______,
-    KC_G   , KC_LSFT, KC_A   , KC_S   , KC_D   , KC_F   ,           _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-    KC_B   , KC_LCTL, DE_Y   , KC_X   , KC_C   , KC_V   ,           _______, _______, _______, _______, _______, _______,
-
-                                  _______, _______, _______,    _______, _______, _______,
-                                           _______, _______,    _______, _______
-  ),
-
-  [_LOWER] = LAYOUT(
-    KC_TILD, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,           KC_CIRC, KC_AMPR, KC_PSLS, KC_PAST, KC_PMNS, KC_DEL     ,
-    _______, DE_HASH, DE_CIRC, KC_PGUP, DE_LABK, _______,           _______, KC_P7  , KC_P8  , KC_P9  , KC_PPLS, KC_BSPC    ,
-    _______, DE_ACUT, KC_HOME, KC_PGDN, KC_END , KC_LPRN,           KC_RPRN, KC_P4  , KC_P5  , KC_P6  , KC_PDOT, _______    ,
-    _______, KC_PLUS, KC_PIPE, KC_UNDS, _______, _______,           KC_P0  , KC_P1  , KC_P2  , KC_P3  , KC_PENT, KC_KP_EQUAL,
-
-                                  _______, KC_RGHT, _______,    _______, _______, _______,
-                                           KC_LEFT, _______,    RESET  , _______
-  ),
-
-  [_RAISE] = LAYOUT(
-    KC_F12 , KC_F1  ,  KC_F2 ,   KC_F3 ,  KC_F4 ,  KC_F5 ,          KC_F6  , KC_F7   , KC_F8   ,  KC_F9  , KC_F10    , KC_F11 ,
-    _______, _______, _______,  KC_UP  , _______, _______,          KC_LALT, KC_INS  , KC_NLCK ,  KC_CALC, KC_PSCREEN, KC_MUTE,
-    _______, _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_ENT ,          KC_MSEL, KC_MPRV , KC_MPLY ,  KC_MNXT, _______   , KC_VOLU,
-    _______, _______, _______,  _______, _______, _______,          DE_HASH, KC_MYCM , _______ ,  _______, KC_SLCK   , KC_VOLD,
-
-                                  _______, _______, _______,    _______, KC_UP  , _______,
-                                           _______, _______,    _______, KC_DOWN
-  ),
-
-  [_ADJUST] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, RESET  , _______,           _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, DF(_GAME),         _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, DF(_BASE),         _______, _______, _______, _______, _______, _______,
-
-                                   _______, _______, _______,    _______, _______, _______,
-                                            _______, _______,    _______, _______
-  ),
-};
-
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
--- a/keyboards/hidtech/bastyl/keymaps/german_gaming/readme.md
+++ b/keyboards/hidtech/bastyl/keymaps/german_gaming/readme.md
@@ -1,24 +0,0 @@
-![German Gaming Layout Image](https://i.imgur.com/0y938rG.png)
-
-Despite being less accurate, the columns in the image are shifted up and down to avoid the [Hermann grid illusion](https://en.wikipedia.org/wiki/Grid_illusion).
-
-
-# German Gaming Layout
-
-This layout was build with gaming in mind for a german user. As a result I added a "game" layer that shifts the keys of the left side (below the number row) one to the right, so that <kbd>WASD</kbd> is on the <kbd>ESDF</kbd> keys. The reason this layer was added is that using <kbd>WASD</kbd> is less comfortable with a contoured Dactyl-style keyboard, where each column is adjusted for the respective fingers. <kbd>ESDF</kbd> also has the upside of allowing one to stay in the home row. Note that the rightmost column of the default layer, so <kbd>TGB</kbd>, ends up in the leftmost position.
-
-Of course, one could just be forced to reconfigure every game, but that wouldn't be very user-friendly and likely reduce satisfaction with the layout. When in game mode, the right side of keys also features arrow keys on <kbd>IJKL</kbd>.
-
-
-## Raise and Lower layer
-
-Additionally, via the RAISE layer, it's always possible to access the arrow keys, which are often used in game menues. On the exact same position one can access <kbd>Home</kbd>, <kbd>End</kbd>, <kbd>Page Down</kbd> and <kbd>Page Up</kbd> via the LOWER layer. The left side of the LOWER layer also contains the few characters that would usually have their own key in a traditional german keyboard.
-
-The right side features various media keys in the RAISE layer, and a numpad in the LOWER layer.
-
-
-## Firmware
-
-The keyboard can be put into Reset mode (for flashing a keymap) by pressing <kbd>**LOWER**</kbd> + <kbd>Super</kbd> (also known as Windows key), or by pressing <kbd>**LOWER**</kbd> + <kbd>**RAISE**</kbd> + <kbd>R</kbd>.
-
-`MOUSEKEY_ENABLE` was set to `no` for this keymap, since it wasn't used and the size of the firmware ended up being too large.
--- a/keyboards/hidtech/bastyl/keymaps/german_gaming/rules.mk
+++ b/keyboards/hidtech/bastyl/keymaps/german_gaming/rules.mk
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = no
--- a/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c
+++ b/keyboards/kbdfans/kbd75/keymaps/noroadsleft/keymap.c
@@ -1,212 +0,0 @@
-/* Copyright 2020 James Young (@noroadsleft)
- *
- * 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 "noroadsleft.h"
-//#include "version.h"
-#include "sendstring_dvorak.h"
-
-#define LAYOUT_75_ansi_wkl( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
-    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
-    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K315, \
-    K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414, K415, \
-    K500, K501,                         K506,                         K510, K512, K513, K514, K515  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
-    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215 }, \
-    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO, K315 }, \
-    { K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414,  K415 }, \
-    { K500,  K501,  KC_NO, KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  KC_NO, K512,  K513,  K514,  K515 }  \
-}
-
-enum layer_names {
-    _QW,
-    _DV,
-    _Q2,
-    _FN,
-    _SY
-};
-
-enum custom_keycodes {
-    GO_Q2 = KEYMAP_SAFE_RANGE,
-    Q2_ENT
-};
-
-unsigned char q2InputMode = 0;
-
-// Tap Dance declarations
-enum tap_dances {
-    LAG,
-    RAG,
-};
-
-// Tap Dance definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for Escape, twice for Caps Lock
-    [LAG] = ACTION_TAP_DANCE_DOUBLE(KC_LALT, KC_LGUI),
-    [RAG] = ACTION_TAP_DANCE_DOUBLE(KC_RALT, KC_RGUI),
-};
-
-#define FN_CAPS LT(_FN,KC_CAPS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QW] = LAYOUT_75_ansi_wkl(
-        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(_SY),
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_HOME,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
-        FN_CAPS, 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_PGDN,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, TD(LAG),                                     KC_SPC,                                      TD(RAG), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_DV] = LAYOUT_75_ansi_wkl(
-        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(_SY),
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC,          KC_BSPC, KC_HOME,
-        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSLS,          KC_PGUP,
-        FN_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,          KC_ENT,           KC_PGDN,
-        KC_LSFT,          KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,             KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, TD(LAG),                                     KC_SPC,                                      TD(RAG), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_Q2] = LAYOUT_75_ansi_wkl(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          Q2_ENT,           _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, KC_LALT,                                     _______,                                     KC_RALT, _______, _______, _______, _______
-    ),
-    [_FN] = LAYOUT_75_ansi_wkl(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_DEL,  _______,
-        _______, KC_CALC, KC_APP,  G_PUSH,  _______, _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS,          _______,
-        _______, M_SALL,  _______, G_FTCH,  _______, _______, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,          _______,          _______,
-        _______,          M_UNDO,  M_CUT,   M_COPY,  M_PASTE, G_BRCH,  _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, _______, _______,
-        _______, _______,                                     _______,                                     _______, _______, _______, _______, _______
-    ),
-    [_SY] = LAYOUT_75_ansi_wkl(
-        _______, TO(_QW), TO(_DV), _______, GO_Q2,   _______, _______, _______, RESET,   EEP_RST, DEBUG,   _______, VRSN,    _______, _______, _______,
-        _______, _______, M_MDSWP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_DEL,  _______,
-        _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_BRTG, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______,                                     _______,                                     _______, _______, _______, _______, _______
-    ),
-};
-
-bool led_update_user(led_t led_state) {
-    writePin(B2, !led_state.caps_lock);
-    return false;
-}
-
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case G_PUSH:
-            if (record->event.pressed) {
-                SEND_STRING("git push origin ");
-            };
-            return false;
-        case G_FTCH:
-            if (record->event.pressed) {
-                if ( get_mods() & MOD_MASK_SHIFT ) {
-                    clear_mods();
-                    SEND_STRING("git pull upstream ");
-                } else {
-                    SEND_STRING("git fetch upstream ");
-                }
-            };
-            return false;
-        case G_BRCH:
-            if (record->event.pressed) {
-                if ( get_mods() & MOD_MASK_SHIFT ) {
-                    clear_mods();
-                    SEND_STRING("master");
-                } else {
-                    SEND_STRING("$(git branch-name)");
-                }
-            };
-            return false;
-        case GO_Q2:
-            if (record->event.pressed) {
-                layer_move(_QW);
-                layer_on(_Q2);
-            };
-            return false;
-        case Q2_ENT:
-            if (record->event.pressed) {
-                if (q2InputMode == 0) {
-                    tap_code(KC_ENT);
-                    q2InputMode = 1;
-                    layer_on(_DV);
-                    //layer_on(_Q2);
-                } else if (q2InputMode == 1) {
-                    tap_code(KC_ENT);
-                    q2InputMode = 0;
-                    layer_off(_DV);
-                } else {
-                    tap_code(KC_ENT);
-                }
-            };
-            return false;
-        case KC_ESC:
-            if (record->event.pressed) {
-                if (q2InputMode > 0) {
-                    tap_code(KC_ESC);
-                    q2InputMode = 0;
-                    layer_off(_DV);
-                } else {
-                    tap_code(KC_ESC);
-                }
-            };
-            return false;
-        case KC_GRV:
-            if (IS_LAYER_ON(_Q2) == true) {
-                if (record->event.pressed) {
-                    if (q2InputMode == 0) {
-                        tap_code(KC_GRV);
-                        q2InputMode = 2;
-                        layer_on(_DV);
-                    } else if (q2InputMode == 1) {
-                        tap_code(KC_GRV);
-                        q2InputMode = 2;
-                    } else {
-                        tap_code(KC_GRV);
-                        q2InputMode = 0;
-                        layer_off(_DV);
-                    }
-                    return false;
-                }
-            };
-            return true;
-        case KC_Z:
-            if (record->event.pressed) {
-                if ( get_mods() & MOD_MASK_RALT ) {
-                    register_code(KC_NUBS);
-                } else {
-                    register_code(KC_Z);
-                }
-            } else {
-                if ( get_mods() & MOD_MASK_RALT ) {
-                    unregister_code(KC_NUBS);
-                } else {
-                    unregister_code(KC_Z);
-                }
-            };
-            return false;
-        default:
-            return true;
-    }
-}
--- a/keyboards/kbdfans/kbd75/keymaps/noroadsleft/rules.mk
+++ b/keyboards/kbdfans/kbd75/keymaps/noroadsleft/rules.mk
@@ -1,6 +0,0 @@
-BOOTMAGIC_ENABLE = lite
-CONSOLE_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-
-VIA_ENABLE = no
-LTO_ENABLE = yes
--- a/keyboards/kc60/keymaps/noroadsleft/config.h
+++ b/keyboards/kc60/keymaps/noroadsleft/config.h
@@ -1,19 +1,3 @@
-/* Copyright 2018-2020 James Young (@noroadsleft)
- *
- * 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

 #define PERMISSIVE_HOLD // https://docs.qmk.fm/#/feature_advanced_keycodes?id=permissive-hold
--- a/keyboards/kc60/keymaps/noroadsleft/keymap.c
+++ b/keyboards/kc60/keymaps/noroadsleft/keymap.c
@@ -1,23 +1,8 @@
-/* Copyright 2018-2020 James Young (@noroadsleft)
- *
- * 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 "noroadsleft.h"
-#include "sendstring_dvorak.h"
-//#include "sendstring_colemak.h"
-#include "print.h"
+#include QMK_KEYBOARD_H
+#include "version.h"
+#include <sendstring_dvorak.h>
+//#include <sendstring_colemak.h>
+#include <print.h>


 /**********************
@@ -25,33 +10,83 @@
 **********************/
 enum layer_names {
    // BASE LAYERS
-    _QW,  // QWERTY
-    _DV,  // Dvorak
-    _CM,  // Colemak
-    // QUAKE 2 OVERLAY
-    _Q2,  // Quake 2
-    // FUNCTION LAYER
-    _FN,  // Function
+        // SHORT CODES
+    _QWERTY = 0,
+        _QW = _QWERTY,
+    _DVORAK,
+        _DV = _DVORAK,
+    _COLEMAK,
+        _CM = _COLEMAK,
+    _MAC,
+        _MC = _MAC,
+    _QUAKE2,
+        _Q2 = _QUAKE2,
+    _QUAKE2_DVORAK,
+        _QD = _QUAKE2_DVORAK,
+    _QUAKE2_CONSOLE,
+        _QC = _QUAKE2_CONSOLE,
+    // FUNCTION LAYERS
+    _FUNCWIN,
+        _FW = _FUNCWIN,
+    _FUNCMAC,
+        _FM = _FUNCMAC,
+    _FUNCQ2,
+        _FQ = _FUNCQ2,
    // OTHER LAYERS
-    _NP,  // Numpad
-    _MA,  // Macros
-    _SY,  // System
+    _NUMPAD,
+        _NP = _NUMPAD,
+    _MACROS,
+        _MA = _MACROS,
+    _SYSTEM,
+        _SY = _SYSTEM,
 };


 // KEYCODE DEFINITIONS
 #define NO_CHNG KC_TRNS // Note for me for keys I need to leave as Pass-through

-#define FN_CAPS LT(_FN, KC_CAPS)  // Function Layer when held, Caps Lock when tapped
-#define Q2_CAPS LT(_FQ, KC_CAPS)  // Quake 2 Function Layer when held, Caps Lock when tapped
+#define FW_CAPS LT(_FUNCWIN, KC_CAPS) // _FUNCWIN when held, Caps Lock when tapped
+#define FM_CAPS LT(_FUNCMAC, KC_CAPS) // _FUNCMAC when held, Caps Lock when tapped
+#define Q2_CAPS LT(_FUNCQ2, KC_CAPS)  // _FUNCQ2 when held, Caps Lock when tapped
+
+#define WN_SALL LCTL(DV_A)       // Windows/Linux Select All
+#define WN_UNDO LCTL(DV_Z)       // Windows/Linux Undo
+#define WN_CUT  LCTL(DV_X)       // Windows/Linux Cut
+#define WN_COPY LCTL(DV_C)       // Windows/Linux Copy
+#define WN_PSTE LCTL(DV_V)       // Windows/Linux Paste

 #define CTL_GRV MT(MOD_LCTL, KC_GRV)  // Left Control when held, Grave accent when tapped

+#define MC_PSCR LGUI(LSFT(KC_3)) // MacOS Print Screen (Command + Shift + 3)
+#define MC_HOME LGUI(KC_LEFT)    // MacOS Home (Command + Left Arrow)
+#define MC_END  LGUI(KC_RGHT)    // MacOS End (Command + Right Arrow)
+#define MC_SALL LGUI(KC_A)       // MacOS Select All
+//#define MC_UNDO LGUI(KC_Z)       // MacOS Undo // replaced by macro
+#define MC_CUT  LGUI(KC_X)       // MacOS Cut
+#define MC_COPY LGUI(KC_C)       // MacOS Copy
+//#define MC_PSTE LGUI(KC_V)       // MacOS Paste // replaced by macro
+

 // MACRO DEFINITIONS
 enum custom_keycodes {
-    GO_Q2 = KEYMAP_SAFE_RANGE,
-    Q2_ENT
+    F_CAPS = SAFE_RANGE,
+    T_L3DED,
+    G_PUSH,
+    G_FTCH,
+    G_COMM,
+    G_RST,
+    G_C10R,
+    G_BRCH,
+    SIGNA,
+    GO_Q2,
+    Q2_ON,
+    Q2_OFF,
+    Q2_ESC,
+    Q2_GRV,
+    MC_UNDO,
+    MC_PSTE,
+    NUBS_Z,
+    VRSN
 };


@@ -59,90 +94,158 @@ enum custom_keycodes {
 ** MODIFIER MASKS **
 *******************/
 #define MOD_MASK_RALT   (MOD_BIT(KC_RALT))
-unsigned char q2InputMode = 0;


-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    switch(keycode) {
        // these are our macros!
+        case F_CAPS:
+            /*
+             * Objective: write a macro that checks the current layers that are
+             * enabled, and activates the appropriate function layer.
+             */
+            if ( biton32(layer_state) == _MAC ) {
+                if (record->event.pressed) {
+                    layer_on(_FUNCMAC);
+                } else {
+                    layer_off(_FUNCMAC);
+                }
+            } else {
+                if (record->event.pressed) {
+                    layer_on(_FUNCWIN);
+                } else {
+                    layer_off(_FUNCWIN);
+                }
+            };
+            return false;
+        case T_L3DED:
+            if (record->event.pressed) {
+                SEND_STRING("lavak3DED ");
+            };
+            return false;
+        case G_PUSH:
+            if (record->event.pressed) {
+                SEND_STRING("git push origin ");
+            };
+            return false;
+        case G_FTCH:
+            if (record->event.pressed) {
+                if ( get_mods() & MOD_MASK_SHIFT ) {
+                    clear_mods();
+                    SEND_STRING("git pull upstream ");
+                } else {
+                    SEND_STRING("git fetch upstream ");
+                }
+            };
+            return false;
+        case G_COMM:
+            if (record->event.pressed) {
+                SEND_STRING("git commit -m \"\"" SS_TAP(X_LEFT));
+                layer_off(_MACROS);
+            };
+            return false;
+        case G_BRCH:
+            if (record->event.pressed) {
+                if ( get_mods() & MOD_MASK_SHIFT ) {
+                    clear_mods();
+                    SEND_STRING("master");
+                } else {
+                    SEND_STRING("$(git branch-name)");
+                }
+                layer_off(_MACROS);
+            };
+            return false;
+        case SIGNA:
+            if (record->event.pressed) {
+                SEND_STRING("\\- @noroadsleft" SS_TAP(X_ENTER));
+                layer_off(_MACROS);
+            };
+            return false;
        case GO_Q2:
            if (record->event.pressed) {
-                //default_layer_set(_QW);
-                layer_move(_QW); // TO(_QW);
-                layer_on(_Q2);
-                //layer_off(_SY);
+                //default_layer_set(_QWERTY);
+                layer_move(_QWERTY); // TO(_QWERTY);
+                layer_on(_QUAKE2);
+                //layer_off(_SYSTEM);
            };
            return false;
-        case Q2_ENT:
+        case Q2_ON:
            if (record->event.pressed) {
-                if (q2InputMode == 0) {
-                    tap_code(KC_ENT);
-                    q2InputMode = 1;
-                    layer_on(_DV);
-                    //layer_on(_Q2);
-                } else if (q2InputMode == 1) {
-                    tap_code(KC_ENT);
-                    q2InputMode = 0;
-                    layer_off(_DV);
-                } else {
-                    tap_code(KC_ENT);
-                }
+                SEND_STRING(SS_TAP(X_ENTER));
+                layer_on(_DVORAK);
+                layer_on(_QUAKE2_DVORAK);
            };
            return false;
-        case KC_ESC:
+        case Q2_OFF:
            if (record->event.pressed) {
-                if (q2InputMode > 0) {
-                    tap_code(KC_ESC);
-                    q2InputMode = 0;
-                    layer_off(_DV);
+                SEND_STRING(SS_TAP(X_ENTER));
+                layer_move(_QWERTY); // TO(_QWERTY);
+                layer_on(_QUAKE2);
+            };
+            return false;
+        case Q2_ESC:
+            if (record->event.pressed) {
+                SEND_STRING(SS_TAP(X_ESCAPE));
+                layer_move(_QWERTY); // TO(_QWERTY);
+                layer_on(_QUAKE2);
+            };
+            return false;
+        case Q2_GRV:
+            if (record->event.pressed) {
+                SEND_STRING(SS_TAP(X_GRAVE));
+                layer_on(_DVORAK);
+                layer_on(_QUAKE2_DVORAK);
+                layer_on(_QUAKE2_CONSOLE);
+            };
+            return false;
+        case MC_UNDO:
+            if (record->event.pressed) {
+                if ( get_mods() & MOD_MASK_SHIFT ) {
+                    SEND_STRING( SS_DOWN(X_LSHIFT) SS_DOWN(X_LGUI) SS_TAP(X_Z) SS_UP(X_LGUI) SS_UP(X_LSHIFT) );
                } else {
-                    tap_code(KC_ESC);
+                    SEND_STRING( SS_DOWN(X_LGUI) SS_TAP(X_Z) SS_UP(X_LGUI) );
                }
            };
            return false;
-        case KC_GRV:
-            if (IS_LAYER_ON(_Q2) == true) {
-                if (record->event.pressed) {
-                    if (q2InputMode == 0) {
-                        tap_code(KC_GRV);
-                        q2InputMode = 2;
-                        layer_on(_DV);
-                    } else if (q2InputMode == 1) {
-                        tap_code(KC_GRV);
-                        q2InputMode = 2;
-                    } else {
-                        tap_code(KC_GRV);
-                        q2InputMode = 0;
-                        layer_off(_DV);
-                    }
+        case MC_PSTE:
+            if (record->event.pressed) {
+                if ( get_mods() & MOD_MASK_SHIFT ) {
+                    SEND_STRING( SS_DOWN(X_LSHIFT) SS_DOWN(X_LGUI) SS_DOWN(X_LALT) SS_TAP(X_V) SS_UP(X_LALT) SS_UP(X_LGUI) SS_UP(X_LSHIFT) );
+                } else {
+                    SEND_STRING( SS_DOWN(X_LGUI) SS_TAP(X_V) SS_UP(X_LGUI) );
                }
            };
            return false;
-        case KC_Z:
+        case NUBS_Z:
            if (record->event.pressed) {
                if ( get_mods() & MOD_MASK_RALT ) {
-                    register_code(KC_NUBS);
+                    SEND_STRING( SS_DOWN(X_NONUS_BSLASH) );
                } else {
-                    register_code(KC_Z);
+                    SEND_STRING( SS_DOWN(X_Z) );
                }
            } else {
                if ( get_mods() & MOD_MASK_RALT ) {
-                    unregister_code(KC_NUBS);
+                    SEND_STRING( SS_UP(X_NONUS_BSLASH) );
                } else {
-                    unregister_code(KC_Z);
+                    SEND_STRING( SS_UP(X_Z) );
                }
            };
            return false;
+        case VRSN:
+            if (record->event.pressed) {
+                SEND_STRING( QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION );
+            }
+            return false;
        case KC_1 ... KC_0:
            if (record->event.pressed) {
                if ( get_mods() & MOD_MASK_RALT ) {
-                    register_code( keycode + 0x3B );
+                    register_code( keycode + 0x3b );
                } else {
                    register_code( keycode );
                }
            } else {
                if ( get_mods() & MOD_MASK_RALT ) {
-                    unregister_code( keycode + 0x3B );
+                    unregister_code( keycode + 0x3b );
                } else {
                    unregister_code( keycode );
                }
@@ -176,30 +279,47 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    ****************/

    /* QWERTY */
-    [_QW] = LAYOUT_60_ansi(
-        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_EQL,  KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        FN_CAPS, 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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
-        CTL_GRV, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_MA), MO(_FN), KC_RCTL
+    [_QWERTY] = LAYOUT_60_ansi(
+        //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+        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_EQL,  KC_BSPC, \
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, \
+        FW_CAPS, 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_LSFT, NUBS_Z,  KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   \
+        CTL_GRV, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(_MA), MO(_FW), KC_RCTL  \
    ),

    /* Dvorak */
-    [_DV] = LAYOUT_60_ansi(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC,
-        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSLS,
-        FN_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,          KC_ENT,
-        KC_LSFT,          KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,             KC_RSFT,
-        CTL_GRV, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_MA), MO(_FN), KC_RCTL
+    [_DVORAK] = LAYOUT_60_ansi(
+        //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_BSPC, \
+        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSLS, \
+        FW_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, KC_ENT,           \
+        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT,                   \
+        CTL_GRV, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(_MA), MO(_FW), KC_RCTL  \
    ),

    /* Colemak */
-    [_CM] = LAYOUT_60_ansi(
-        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_EQL,  KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,
-        FN_CAPS, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
-        CTL_GRV, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_MA), MO(_FN), KC_RCTL
+    [_COLEMAK] = LAYOUT_60_ansi(
+        //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+        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_EQL,  KC_BSPC, \
+        KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, \
+        FW_CAPS, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, KC_ENT,           \
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   \
+        CTL_GRV, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(_MA), MO(_FW), KC_RCTL  \
+    ),
+
+    /****************
+    ** OS OVERLAYS **
+    ****************/
+
+    /* Mac */
+    [_MAC] = LAYOUT_60_ansi(
+        //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        FM_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          \
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   \
+        _______, _______, _______,                   _______,                                     _______, _______, MO(_FM), _______  \
    ),

    /*********************
@@ -207,25 +327,65 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *********************/

    /* Quake 2 */
-    [_Q2] = LAYOUT_60_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          Q2_ENT,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        KC_GRV,  _______, _______,                            _______,                            _______, _______, _______, _______
+    [_QUAKE2] = LAYOUT_60_ansi(
+        //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        Q2_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, Q2_ON,            \
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   \
+        _______, _______, _______,                   _______,                                     _______, _______, MO(_FQ), _______  \
+    ),
+
+    [_QUAKE2_DVORAK] = LAYOUT_60_ansi(
+        //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+        Q2_ESC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        Q2_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, Q2_OFF,           \
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   \
+        _______, _______, _______,                   _______,                                     _______, _______, MO(_FQ), _______  \
+    ),
+
+    [_QUAKE2_CONSOLE] = LAYOUT_60_ansi(
+        //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+        Q2_ESC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        Q2_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ENT,           \
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   \
+        _______, _______, _______,                   _______,                                     _______, _______, MO(_FQ), _______  \
    ),

    /********************
    ** FUNCTION LAYERS **
    ********************/

-    /* Fn layer */
-    [_FN] = LAYOUT_60_ansi(
-        KC_GRV,  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_DEL,
-        _______, KC_CALC, KC_APP,  _______, _______, _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS,
-        NO_CHNG, M_SALL,  _______, _______, _______, _______, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,          KC_PENT,
-        _______,          M_UNDO,  M_CUT,   M_COPY,  M_PASTE, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, TG(_SY),          _______,
-        _______, _______, _______,                            TG(_NP),                            _______, _______, NO_CHNG, _______
+    /* Windows Fn layer */
+    [_FUNCWIN] = LAYOUT_60_ansi(
+        //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+        KC_GRV,  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_DEL,  \
+        _______, KC_CALC, KC_APP,  _______, _______, _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS, \
+        NO_CHNG, WN_SALL, _______, _______, _______, _______, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_PENT,          \
+        _______, WN_UNDO, WN_CUT,  WN_COPY, WN_PSTE, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, TG(_SY), _______,                   \
+        _______, _______, _______,                   TG(_NP),                                     _______, TG(_MA), NO_CHNG, _______  \
+    ),
+
+    /* MacOS Fn layer */
+    [_FUNCMAC] = LAYOUT_60_ansi(
+        //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+        KC_GRV,  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_DEL,  \
+        _______, _______, _______, _______, _______, _______, KC_INS,  MC_HOME, KC_UP,   MC_END,  KC_PGUP, MC_PSCR, _______, _______, \
+        NO_CHNG, MC_SALL, _______, _______, _______, _______, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______,          \
+        _______, MC_UNDO, MC_CUT,  MC_COPY, MC_PSTE, _______, _______, _______, _______, _______, TG(_SY), _______,                   \
+        _______, _______, _______,                   TG(_NP),                                     _______, _______, NO_CHNG, _______  \
+    ),
+
+    /* Quake 2 Fn layer */
+    [_FUNCQ2] = LAYOUT_60_ansi(
+        //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+        Q2_GRV,  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_DEL,  \
+        _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS, \
+        NO_CHNG, _______, _______, _______, _______, _______, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_ENT,           \
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG(_SY), _______,                   \
+        _______, _______, _______,                   _______,                                     _______, _______, NO_CHNG, _______  \
    ),

    /*****************
@@ -233,30 +393,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *****************/

    /* Numpad layer */
-    [_NP] = LAYOUT_60_ansi(
-        _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, _______,
-        _______, _______, _______, _______, KC_E,    KC_F,    _______, KC_P4,   KC_P5,   KC_P6,   KC_PAST, KC_PSLS, KC_PEQL, _______,
-        _______, _______, _______, _______, KC_C,    KC_D,    _______, KC_P1,   KC_P2,   KC_P3,   KC_PPLS, KC_PMNS,          KC_PENT,
-        _______,          _______, _______, _______, KC_A,    KC_B,    _______, KC_P0,   _______, KC_PDOT, _______,          _______,
-        _______, _______, _______,                            TG(_NP),                            _______, _______, NO_CHNG, _______
+    [_NUMPAD] = LAYOUT_60_ansi(
+        //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+        _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, _______, \
+        _______, _______, _______, _______, KC_E,    KC_F,    _______, KC_P4,   KC_P5,   KC_P6,   KC_PAST, KC_PSLS, KC_PEQL, _______, \
+        _______, _______, _______, _______, KC_C,    KC_D,    _______, KC_P1,   KC_P2,   KC_P3,   KC_PPLS, KC_PMNS, KC_PENT,          \
+        _______, _______, _______, _______, KC_A,    KC_B,    _______, KC_P0,   _______, KC_PDOT, _______, _______,                   \
+        _______, _______, _______,                   TG(_NP),                                     _______, _______, NO_CHNG, _______  \
    ),

    /* Macro layer */
-    [_MA] = LAYOUT_60_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DM_REC1, DM_REC2, _______,
-        _______, _______, _______, G_PUSH,  _______, _______, _______, _______, _______, _______, _______, DM_PLY1, DM_PLY2, DM_RSTP,
-        _______, _______, _______, G_FTCH,  _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, G_BRCH,  _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, NO_CHNG, _______
+    [_MACROS] = LAYOUT_60_ansi(
+        //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+        TG(_MA), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DM_REC1, DM_REC2, _______, \
+        _______, _______, _______, G_PUSH,  _______, _______, _______, _______, _______, _______, _______, DM_PLY1, DM_PLY2, DM_RSTP, \
+        _______, _______, _______, G_FTCH,  G_COMM,  _______, _______, _______, _______, _______, _______, _______, _______,          \
+        _______, _______, _______, _______, _______, G_BRCH,  SIGNA,   _______, _______, _______, _______, _______,                   \
+        _______, _______, _______,                   _______,                                     _______, _______, NO_CHNG, _______  \
    ),

    /* System layer */
-    [_SY] = LAYOUT_60_ansi(
-        TG(_SY), TO(_QW), TO(_DV), TO(_CM), GO_Q2,   XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, DEBUG,   XXXXXXX, VRSN,    XXXXXXX,
-        XXXXXXX, XXXXXXX, M_MDSWP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-        XXXXXXX,          XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_BRTG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, NO_CHNG, XXXXXXX
+    [_SYSTEM] = LAYOUT_60_ansi(
+        //       2        3        4        5        6        7        8        9        10       11       12       13       14       15       16
+        TG(_SY), TO(_QW), TO(_DV), TO(_CM), GO_Q2,   XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, DEBUG,   XXXXXXX, VRSN,    XXXXXXX, \
+        XXXXXXX, XXXXXXX, TG(_MC), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          \
+        XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_BRTG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   \
+        XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,                                     XXXXXXX, XXXXXXX, NO_CHNG, XXXXXXX  \
    ),

 };
--- a/keyboards/kc60/keymaps/noroadsleft/readme.md
+++ b/keyboards/kc60/keymaps/noroadsleft/readme.md
@@ -27,12 +27,15 @@ Descriptions of the physical locations of keys will use the key's function in a
  - Layer 0: QWERTY `_QW`
  - Layer 1: Hardware Dvorak `_DV`
  - Layer 2: Hardware Colemak `_CM`
- [Quake 2 Overlays](./readme_ch2.md)
-  - Layers 3, 4 and 5: Quake 2 `_Q2`, Quake 2 Dvorak `_QD`, and Quake 2 Console `_QC`
- [Function Layers](./readme_ch3.md)
-  - Layer 6: Fn layer `_FN`
-  - Layer 7: Quake 2 Fn layer `_FQ`
- [Other Layers](./readme_ch4.md)
-  - Layer 8: Numpad layer `_NP`
-  - Layer 9: Macro layer `_MA`
-  - Layer 10: System layer `_SY`
+- [OS Overlays](./readme_ch2.md)
+  - Layer 3: MacOS Overlay `_MC`
+- [Quake 2 Overlays](./readme_ch3.md)
+  - Layers 4, 5 and 6: Quake 2 `_Q2`, Quake 2 Dvorak `_QD`, and Quake 2 Console `_QC`
+- [Function Layers](./readme_ch4.md)
+  - Layer 7: Windows Fn layer `_FW`
+  - Layer 8: MacOS-oriented Fn layer `_FM`
+  - Layer 9: Quake 2 Fn layer `_FQ`
+- [Other Layers](./readme_ch5.md)
+  - Layer 10: Numpad layer `_NP`
+  - Layer 11: Macro layer `_MA`
+  - Layer 12: System layer `_SY`
--- a/keyboards/kc60/keymaps/noroadsleft/readme_ch1.md
+++ b/keyboards/kc60/keymaps/noroadsleft/readme_ch1.md
@@ -2,9 +2,10 @@

 - [Table of Contents](./readme.md)
  1. **Base Layers**
-  2. [Quake 2 Overlays](./readme_ch2.md)
-  3. [Function Layers](./readme_ch3.md)
-  4. [Other Layers](./readme_ch4.md)
+  2. [**OS Overlays**](./readme_ch2.md)
+  3. [Quake 2 Overlays](./readme_ch3.md)
+  4. [Function Layers](./readme_ch4.md)
+  5. [Other Layers](./readme_ch5.md)


 ----
@@ -18,7 +19,7 @@ Standard QWERTY layout, with four QMK features:
 - The `Caps Lock` key has been replaced with a dual function `LT()` key, which opens the Windows Fn layer when held, and is `Caps Lock` when tapped
 - The Left `Control` key has been replaced with a `MT(MOD_CTRL, KC_GRV)` key, which is <code>&#96; ~</code> when tapped and `Ctrl` when held.

-![QWERTY layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/QWERTY.png)
+![QWERTY layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/layer_00.png)


 ----
@@ -29,7 +30,7 @@ Standard QWERTY layout, with four QMK features:

 A hardware-based Dvorak Simplified layout. At my weekend job, I use a shared computer that runs MacOS Sierra, in US QWERTY layout. In this layer, I can leave the system in QWERTY, plug my keyboard in, and still type in Dvorak.

-![Hardware Dvorak layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/Dvorak.png)
+![Hardware Dvorak layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/layer_01.png)


 ----
@@ -40,9 +41,9 @@ A hardware-based Dvorak Simplified layout. At my weekend job, I use a shared com

 A hardware-based Colemak layout. Been thinking of trying it, so it's here.

-![Hardware Colemak layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/Colemak.png)
+![Hardware Colemak layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/layer_02.png)


 ----

-Next Chapter: [Quake 2 Overlays](./readme_ch2.md)
+Next Chapter: [OS Overlays](./readme_ch2.md)
--- a/keyboards/kc60/keymaps/noroadsleft/readme_ch2.md
+++ b/keyboards/kc60/keymaps/noroadsleft/readme_ch2.md
@@ -2,35 +2,23 @@

 - [Table of Contents](./readme.md)
  1. [Base Layers](./readme_ch1.md)
-  2. **Quake 2 Overlays**
-  3. [Function Layers](./readme_ch3.md)
-  4. [Other Layers](./readme_ch4.md)
+  2. **OS Overlays**
+  3. [Quake 2 Overlays](./readme_ch3.md)
+  4. [Function Layers](./readme_ch4.md)
+  5. [Other Layers](./readme_ch5.md)


 ----

-## Layers 3, 4 and 5: Quake 2 `_Q2`, Quake 2 Dvorak `_QD`, and Quake 2 Console `_QC`
+## Layer 3: Layer 3: MacOS Overlay `_MC`

-### Accessed by holding either `Fn` key and tapping the `/?` key, then tapping `4$`
+### Toggled by holding either `Fn` and tapping `/?` key, then tapping `W`.

-These layers were born out of the confusion I have had trying to use the in-game chat and the console in [Quake 2](https://en.wikipedia.org/wiki/Quake_II). When Quake 2 came out, alternate keyboard layouts weren't really a thing. As a result, all in-game text input is hard-locked to US QWERTY, regardless of what the operating system is using for its input method.
+This layer overrides the `Fn` keys on whichever base layer is currently enabled, sending the keyboard to the MacOS-oriented Fn layer `_FM`, instead of the Windows Fn layer `_FW`.

-I'm attempting to solve this by some creative use of QMK's macro feature. The keycode in the System layer that enables these layers, [`GO_Q2`](./keymap.c#L387), is a [macro](./keymap.c#L101-L108) that sets the default layer to the QWERTY layer, then turns the Quake 2 layer `_Q2` on. The result is a partially-overwritten QWERTY layer, that has some keycodes with some creative layer switching.
-
-When I hit the `Enter` key (bound in-game to text chat), the [macro keycode](./keymap.c#L109-L115) I've created sends the keycode for `Enter`, then follows with enabling the Hardware Dvorak layer and its corresponding overlay. Now the game is in text chat mode, and my keyboard is in Dvorak. When I hit `Enter` again, another `Enter` [keycode macro](./keymap.c#L116-L122) is sent, which sends the message, then the macro brings me back to the standard QWERTY+Quake 2 setup. Hitting `Escape` instead runs a [macro](./keymap.c#L123-L129) that cancels the sending of the message, and undoes the layers.
-
-I have been testing this configuration for a few months. Sometimes I end up still in Dvorak mode without any text input systems (in-game chat or the console) running, but it pretty much always happens when I'm focused on the game, so I don't know the cause yet.
-
-### Layer 3: Quake 2
-![Quake 2](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/Quake%202.png)
-
-### Layer 4: Quake 2 Dvorak
-![Quake 2 Dvorak](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/Quake%202%20Dvorak.png)
-
-### Layer 5: Quake 2 Console
-![Quake 2 Console](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/Quake%202%20Console.png)
+![MacOS Overlay](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/layer_03.png)


 ----

-Next Chapter: [Function Layers](./readme_ch3.md)
+Next Chapter: [Quake 2 Overlays](./readme_ch3.md)
--- a/keyboards/kc60/keymaps/noroadsleft/readme_ch3.md
+++ b/keyboards/kc60/keymaps/noroadsleft/readme_ch3.md
@@ -2,39 +2,36 @@

 - [Table of Contents](./readme.md)
  1. [Base Layers](./readme_ch1.md)
-  2. [Quake 2 Overlays](./readme_ch2.md)
-  3. **Function Layers**
-  4. [Other Layers](./readme_ch4.md)
+  2. [OS Overlays](./readme_ch2.md)
+  3. **Quake 2 Overlays**
+  4. [Function Layers](./readme_ch4.md)
+  5. [Other Layers](./readme_ch5.md)


 ----

-## Layer 6: Fn layer - `_FN`
+## Layers 4, 5 and 6: Quake 2 `_Q2`, Quake 2 Dvorak `_QD`, and Quake 2 Console `_QC`

-### Accessed by holding either `Fn` key from any base layer
+### Accessed by holding either `Fn` key and tapping the `/?` key, then tapping `4$`

-Arrows, Navigation keys (Insert, Home, Page Up, etc.), and Function keys are here. Also has keys for Calculator, Menu, Volume Control, and shortcuts for Select All, Undo, Cut, Copy, and Paste. Numpad Enter for when I'm working in Adobe Photoshop, because it treats Numpad Enter differently from the regular Enter key.
+These layers were born out of the confusion I have had trying to use the in-game chat and the console in [Quake 2](https://en.wikipedia.org/wiki/Quake_II). When Quake 2 came out, alternate keyboard layouts weren't really a thing. As a result, all in-game text input is hard-locked to US QWERTY, regardless of what the operating system is using for its input method.

-![Windows Fn layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/Fn.png)
+I'm attempting to solve this by some creative use of QMK's macro feature. The keycode in the System layer that enables these layers, [`GO_Q2`](./keymap.c#L418), is a [macro](./keymap.c#L164-L171) that sets the default layer to the QWERTY layer, then turns the Quake 2 layer `_Q2` on. The result is a partially-overwritten QWERTY layer, that has some keycodes with some creative layer switching.
+
+When I hit the `Enter` key (bound in-game to text chat), the [macro keycode](./keymap.c#L172-L178) I've created sends the keycode for `Enter`, then follows with enabling the Hardware Dvorak layer and its corresponding overlay. Now the game is in text chat mode, and my keyboard is in Dvorak. When I hit `Enter` again, another `Enter` [keycode macro](./keymap.c#L179-L185) is sent, which sends the message, then the macro brings me back to the standard QWERTY+Quake 2 setup. Hitting `Escape` instead runs a [macro](./keymap.c#L186-L192) that cancels the sending of the message, and undoes the layers.
+
+I have been testing this configuration for a few months. Sometimes I end up still in Dvorak mode without any text input systems (in-game chat or the console) running, but it pretty much always happens when I'm focused on the game, so I don't know the cause yet.
+
+### Layer 4: Quake 2
+![Quake 2](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/layer_04.png)
+
+### Layer 5: Quake 2 Dvorak
+![Quake 2 Dvorak](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/layer_05.png)
+
+### Layer 6: Quake 2 Console
+![Quake 2 Console](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/layer_06.png)


 ----

-## Layer 7: Quake 2 Fn layer - `_FQ`
-
-### Accessed by holding either `Fn` key while either Quake 2 overlay is active.
-
-Based on the Windows function layer, but removes some functions that are pointless to have while in the game.
-
-![Quake 2 Fn layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/Quake%202%20Fn.png)
-
-Keycode(s) Sent                   | Notes
-:-------------------------------- | :----
-[`Q2_GRV`](./keymap.c#L130-L137)  | Sends `KC_GRV`, then enables the Dvorak, Quake 2 Dvorak, and Quake 2 Console layers.
-
-
-
-
----
-
-Next Chapter: [Other Layers](./readme_ch4.md)
+Next Chapter: [Function Layers](./readme_ch4.md)
--- a/keyboards/kc60/keymaps/noroadsleft/readme_ch4.md
+++ b/keyboards/kc60/keymaps/noroadsleft/readme_ch4.md
@@ -2,109 +2,51 @@

 - [Table of Contents](./readme.md)
  1. [Base Layers](./readme_ch1.md)
-  2. [Quake 2 Overlays](./readme_ch2.md)
-  3. [Function Layers](./readme_ch3.md)
-  4. **Other Layers**
+  2. [OS Overlays](./readme_ch2.md)
+  3. [Quake 2 Overlays](./readme_ch3.md)
+  4. **Function Layers**
+  5. [Other Layers](./readme_ch5.md)


 ----

-## Layer 8: Numpad layer - `_NP`
+## Layer 7: Windows Fn layer - `_FW`

-### Accessed by holding either `Fn` key and tapping `Space`, from any of the Base Layers
+### Accessed by holding either `Fn` key in Layer 0

-Puts a Numpad on the right-hand side of the keyboard. A through F included for hexadecimal input. Tapping `Space` returns to the previous Base Layer.
+Arrows, Navigation keys (Insert, Home, Page Up, etc.), and Function keys are here. Also has keys for Calculator, Menu, Volume Control, and shortcuts for Select All, Undo, Cut, Copy, and Paste. Numpad Enter for when I'm working in Adobe Photoshop, because it treats Numpad Enter differently from the regular Enter key.

-![Numpad layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/Numpad.png)
+![Windows Fn layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/layer_07.png)


 ----

-## Layer 9: Macro layer - `_MA`
+## Layer 8: MacOS-oriented Fn layer - `_FM`

-### Accessed by holding the right-side `Win` key
+### Accessed by holding either `Fn` key in Layer 1

-Has some macros that I use in Git, some frequently-typed strings, and keys for use with the [Dynamic Macros feature](https://docs.qmk.fm/#/feature_dynamic_macros).
+Based on my Windows Fn layer, but swaps a few functions for a MacOS environment. Arrow, Navigation, and Function keys are basically unchanged from Layer 2. This layer enables using either `Fn` key as a sort of simulated `Command` key, which I find easier to reach and use.

-Tapping `Esc` exits the Macro layer, if the macro used doesn't do it automatically.
-
-![Macro layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/Macro.png)
-
-
-### Macros
-
-#### [G_PUSH](./keymap.c#L71-L75)
-
-Output: `git push origin `
-
-Everything from here down is related to Git or GitHub.
-
-#### [G_FTCH](./keymap.c#L76-L85)
-
-| Condition | Output |
-| :-------- | :----- |
-| If <kbd>Shift</kbd> is active | `git pull upstream ` |
-| Otherwise | `git fetch upstream ` |
-
-#### [G_BRCH](./keymap.c#L86-L95)
-
-| Condition | Output |
-| :-------- | :----- |
-| If <kbd>Shift</kbd> is active | `master` |
-| Otherwise | `$(git branch-name)` |
-
-`$(git branch-name)` is a [git alias](./readme_git.md) that returns the name of the current branch.
-
-#### [SIGNA](./keymap.c#L96-L100)
-
-Output: `\- @noroadsleft` <kbd>Enter</kbd>
-
-Sometimes on GitHub, I sign my comments. Types my GitHub name in Markdown syntax, and then taps the `Enter` key.
-
-#### "Macro Mode" Macros and Customized Keycodes
-
-Some of my macros and keycodes do different things depending on the value of the [`macroMode` variable](./keymap.c#L65), which is toggled between `0` and `1` by the [`M_MDSWP` custom keycode](./keymap.c#L238-L242). This is mainly at attempt to make various shortcuts the same key combinations between Windows/Linux and MacOS (which I use at home and work, respectively).
-
-| Keycode                         | `macroMode == 0` | `macroMode == 1` | `macroMode == 1` with Shift  |
-| :------------------------------ | :--------------- | :--------------- | :--------------------------- |
-| [M_SALL](./keymap.c#L138-L146)  | `Ctrl+A`         | `Cmd+A`          | `Cmd+A`                      |
-| [M_UNDO](./keymap.c#L147-L159)  | `Ctrl+Z`         | `Cmd+Z`          | `Cmd+Shift+Z`                |
-| [M_CUT](./keymap.c#L160-L168)   | `Ctrl+X`         | `Cmd+X`          | `Cmd+X`                      |
-| [M_COPY](./keymap.c#L169-L177)  | `Ctrl+C`         | `Cmd+C`          | `Cmd+C`                      |
-| [M_PASTE](./keymap.c#L178-L190) | `Ctrl+V`         | `Cmd+V`          | `Cmd+Shift+Opt+V`            |
-| `KC_HOME`                       | `KC_HOME`        | `Cmd+Left`       | `Cmd+Left`                   |
-| `KC_END`                        | `KC_END`         | `Cmd+Right`      | `Cmd+Right`                  |
-| `KC_PSCR`                       | `KC_PSCR`        | `Cmd+Shift+3`    | `Cmd+Shift+3`                |
-
-#### [Emulated Non-US Backslash](./keymap.c#L218-L232)
-
-Sometimes I type in languages from countries that use ISO layout, but my keyboard is ANSI, so I have one key fewer. This macro simulates the Non-US Backslash key if I use Right Alt + Z.
-
-#### [VRSN](./keymap.c#L233-L237)
-
-Outputs a string that tells me the Git commit from which my flashed firmware was built. Looks something like:
-
-    kc60/noroadsleft @ 0.6.326-6-gae6d7b-dirty
-
-#### [Emulated Numeric Keypad](./keymap.c#L243-L257)
-
-If I hold the Right Alt key, the number row (`KC_1` through `KC_0`) will output numpad keycodes instead of number row keycodes, enabling quicker access to characters like ™ and °.
-
-#### [Emulated Extended Function Keys](./keymap.c#L258-L272)
-
-Similar to the emulated numpad, if I hold the Right Alt key with the Fn key, the function row (`KC_F1` through `KC_F12`) will output keycodes `KC_F13` throught `KC_F24`.
-
----
-
-### Layer 10: System layer - `_SY`
-
-#### Accessed by holding either `Fn` key and tapping the `/?` key
-
-This is where I change my keyboard function. Base layer select on `1` through `3`, Backlight controls on `C` through `N`, Reset on `8*`, Debug on `0)`.
-
-![System layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/System.png)
+![MacOS-oriented Fn layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/layer_08.png)


 ----

-[Back to the index.](./)
+## Layer 9: Quake 2 Fn layer - `_FQ`
+
+### Accessed by holding either `Fn` key while either Quake 2 overlay is active.
+
+Based on the Windows function layer, but removes some functions that are pointless to have while in the game.
+
+![Quake 2 Fn layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/layer_09.png)
+
+Keycode(s) Sent                   | Notes
+:-------------------------------- | :----
+[`Q2_GRV`](./keymap.c#L193-L200)  | Sends `KC_GRV`, then enables the Dvorak, Quake 2 Dvorak, and Quake 2 Console layers.
+
+
+
+
+----
+
+Next Chapter: [Other Layers](./readme_ch5.md)
--- a/keyboards/kc60/keymaps/noroadsleft/readme_ch5.md
+++ b/keyboards/kc60/keymaps/noroadsleft/readme_ch5.md
@@ -0,0 +1,125 @@
+# @noroadsleft's KC60 keymap
+
+- [Table of Contents](./readme.md)
+  1. [Base Layers](./readme_ch1.md)
+  2. [OS Overlays](./readme_ch2.md)
+  3. [Quake 2 Overlays](./readme_ch3.md)
+  4. [Function Layers](./readme_ch4.md)
+  5. **Other Layers**
+
+
+----
+
+## Layer 10: Numpad layer - `_NP`
+
+### Accessed by holding either `Fn` key and tapping `Space`, from any of the Base Layers
+
+Puts a Numpad on the right-hand side of the keyboard. A through F included for hexadecimal input. Tapping `Space` returns to the previous Base Layer.
+
+![Numpad layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/layer_10.png)
+
+
+----
+
+## Layer 11: Macro layer - `_MA`
+
+### Accessed by holding the `Fn` key and tapping the right-side `Win` key
+
+Has some macros that I use in Git, some frequently-typed strings, and keys for use with the [Dynamic Macros feature](https://docs.qmk.fm/#/feature_dynamic_macros).
+
+Tapping `Esc` exits the Macro layer, if the macro used doesn't do it automatically.
+
+![Macro layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/layer_11.png)
+
+
+### Macros
+
+#### [G_PUSH](./keymap.c#L126-L130)
+
+Output: `git push origin `
+
+Everything from here down is related to Git or GitHub.
+
+#### [G_FTCH](./keymap.c#L131-L140)
+
+| Condition | Output |
+| :-------- | :----- |
+| If <kbd>Shift</kbd> is active | `git pull upstream ` |
+| Otherwise | `git fetch upstream ` |
+
+#### [G_COMM](./keymap.c#L141-L146)
+
+Output: `git commit -m ""` <kbd>Left</kbd>
+
+Readies a `git commit` command, moves the cursor between the quotation marks, then disables the Macro layer.
+
+#### [G_BRCH](./keymap.c#L147-L157)
+
+| Condition | Output |
+| :-------- | :----- |
+| If <kbd>Shift</kbd> is active | `master` |
+| Otherwise | `$(git branch-name)` |
+
+`$(git branch-name)` is a [git alias](./readme_git.md) that returns the name of the current branch. This macro disables the Macro layer when finished.
+
+#### [SIGNA](./keymap.c#L158-L163)
+
+Output: `\- @noroadsleft` <kbd>Enter</kbd>
+
+Sometimes on GitHub, I sign my comments. Types my GitHub name in Markdown syntax, and then taps the `Enter` key. Disables the Macro layer when finished.
+
+#### [MC_UNDO](./keymap.c#L201-L209)
+
+| Condition | Output |
+| :-------- | :----- |
+| If <kbd>Shift</kbd> is active | <kbd>Shift</kbd> + <kbd>Command</kbd> + <kbd>Z</kbd> |
+| Otherwise | <kbd>Command</kbd> + <kbd>Z</kbd> |
+
+An Undo shortcut that turns to Redo if <kbd>Shift</kbd> is being held. I'm not sure that part is required to get that behavior, but it works as desired, so I'm not messing with it.
+
+#### [MC_PSTE](./keymap.c#L210-L218)
+
+| Condition | Output |
+| :-------- | :----- |
+| If <kbd>Shift</kbd> is active | <kbd>Shift</kbd> + <kbd>Command</kbd> + <kbd>Option</kbd> + <kbd>V</kbd> |
+| Otherwise | <kbd>Command</kbd> + <kbd>V</kbd> |
+
+The program I use this in uses <kbd>Shift</kbd> + <kbd>Command</kbd> + <kbd>Option</kbd> + <kbd>V</kbd> to paste while maintaining formatting (typeface, text size, etc.). Sometimes I want this and sometimes I don't. Using <kbd>Shift</kbd> changes the behavior.
+
+#### [NUBS_Z](./keymap.c#L219-L233)
+
+| Condition | Output |
+| :-------- | :----- |
+| If Right <kbd>Alt</kbd> is active | `KC_NUBS` |
+| Otherwise | `KC_Z` |
+
+Sometimes I type in languages from countries that use ISO layout, but my keyboard is ANSI, so I have one key fewer. This macro simulates the Non-US Backslash key if I use Right Alt + Z.
+
+#### [VRSN](./keymap.c#L234-L238)
+
+Outputs a string that tells me the Git commit from which my flashed firmware was built. Looks something like:
+
+    kc60/noroadsleft @ 0.6.326-6-gae6d7b-dirty
+
+#### [Emulated Numeric Keypad](./keymap.c#L239-L253)
+
+If I hold the Right Alt key, the number row (`KC_1` through `KC_0`) will output numpad keycodes instead of number row keycodes, enabling quicker access to characters like ™ and °.
+
+#### [Emulated Extended Function Keys](./keymap.c#L254-L268)
+
+Similar to the emulated numpad, if I hold the Right Alt key with the Fn key, the function row (`KC_F1` through `KC_F12`) will output keycodes `KC_F13` throught `KC_F24`.
+
+----
+
+### Layer 12: System layer - `_SY`
+
+#### Accessed by holding either `Fn` key and tapping the `/?` key
+
+This is where I change my keyboard function. Base layer select on `1` through `3`, Backlight controls on `C` through `N`, Reset on `8*`, Debug on `0)`.
+
+![System layer](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/kc60/keymaps/noroadsleft/layer_12.png)
+
+
+----
+
+[Back to the index.](./)
--- a/keyboards/kc60/keymaps/noroadsleft/rules.mk
+++ b/keyboards/kc60/keymaps/noroadsleft/rules.mk
@@ -1,6 +1,8 @@
+# https://github.com/qmk/qmk_firmware/issues/3448#issuecomment-406636125
+# EXTRAFLAGS        += -flto
+LTO_ENABLE = yes
+
 MOUSEKEY_ENABLE = no        # Mouse keys
 # COMMAND_ENABLE = no         # Commands for debug and configuration
 SPACE_CADET_ENABLE = no     # Space Cadet
 DYNAMIC_MACRO_ENABLE = yes
-
-LTO_ENABLE = yes
--- a/keyboards/melgeek/mj65/config.h
+++ b/keyboards/melgeek/mj65/config.h
@@ -1,51 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * 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"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xEDED
-#define PRODUCT_ID      0x0065
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    MelGeek
-#define PRODUCT         MJ65
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 3
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define DISABLE_RGB_MATRIX_SPLASH
-#define DISABLE_RGB_MATRIX_MULTISPLASH
-#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
-#define DRIVER_ADDR_1 0b0110000
-#define DRIVER_ADDR_2 0b0110000 // this is here for compliancy reasons.
-#define DRIVER_COUNT 1
--- a/keyboards/melgeek/mj65/info.json
+++ b/keyboards/melgeek/mj65/info.json
@@ -1,85 +0,0 @@
-{
-    "keyboard_name": "MJ65",
-    "url": "",
-    "maintainer": "melgeek001365",
-    "width": 16,
-    "height": 5,
-    "layouts": {
-        "LAYOUT_65_ansi": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4},
-                {"x":11, "y":4},
-                {"x":12, "y":4},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
-            ]
-        }
-    }
-}
--- a/keyboards/melgeek/mj65/keymaps/default/keymap.c
+++ b/keyboards/melgeek/mj65/keymaps/default/keymap.c
@@ -1,34 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * 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
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_65_ansi( /* Base */
-			KC_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_INS,
-		    KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLASH, KC_DEL,
-			KC_CAPS,   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_PGUP,
-		    KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,              KC_PGDN,
-		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT, KC_DOWN,   KC_RIGHT
-	),
-	[1] = LAYOUT_65_ansi( /* FN */
-			KC_GESC,   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_DEL,   KC_HOME,
-			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SLCK,  KC_PAUS,  RESET,    _______,
-            _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  _______,  EEP_RST,            _______,
-		    _______,   _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  KC_INS,   KC_END,   _______,  KC_VOLU,            KC_MUTE,
-			_______,   _______,  _______,                      _______,                                _______,  _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
-	)
-};
--- a/keyboards/melgeek/mj65/keymaps/via/keymap.c
+++ b/keyboards/melgeek/mj65/keymaps/via/keymap.c
@@ -1,48 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * 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
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_65_ansi( /* Base */
-			KC_GESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_INS,
-		    KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLASH, KC_DEL,
-			KC_CAPS,   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_PGUP,
-		    KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,              KC_PGDN,
-		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT, KC_DOWN,   KC_RIGHT
-	),
-	[1] = LAYOUT_65_ansi( /* FN */
-			KC_GESC,   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_DEL,   KC_HOME,
-			_______,   RGB_TOG,  _______,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  RGB_MOD,  KC_PSCR,  KC_SLCK,  KC_PAUS,  RESET,    _______,
-            _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPI,  RGB_SPD,  KC_HOME,  _______,  EEP_RST,            _______,
-		    _______,   _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  KC_INS,   KC_END,   _______,  KC_VOLU,            KC_MUTE,
-			_______,   _______,  _______,                      _______,                                _______,  _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT
-	),
-	[2] = LAYOUT_65_ansi(
-			_______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-			_______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-            _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-		    _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-			_______,   _______,  _______,                      _______,                                _______,  _______,  _______,  _______,  _______,  _______
-	),
-	[3] = LAYOUT_65_ansi(
-			_______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-			_______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-            _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-		    _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-			_______,   _______,  _______,                      _______,                                _______,  _______,  _______,  _______,  _______,  _______
-	)
-};
--- a/keyboards/melgeek/mj65/keymaps/via/rules.mk
+++ b/keyboards/melgeek/mj65/keymaps/via/rules.mk
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
--- a/keyboards/melgeek/mj65/mj65.c
+++ b/keyboards/melgeek/mj65/mj65.c
@@ -1,17 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * 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 "mj65.h"
--- a/keyboards/melgeek/mj65/mj65.h
+++ b/keyboards/melgeek/mj65/mj65.h
@@ -1,36 +0,0 @@
-
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * 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 "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E}, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E}, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E}, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E}  \
-}
--- a/keyboards/melgeek/mj65/readme.md
+++ b/keyboards/melgeek/mj65/readme.md
@@ -1,16 +0,0 @@
-# MelGeek MJ65
-
-![MJ65](https://cdn.shopifycdn.net/s/files/1/0078/2863/5712/products/c34621677ffc53ea6d1c68ab82100749_1024x1024@2x.jpg?v=1612186093)
-
-A hotswap 65% RGB Custom Mechanical keyboard with arrow.
-
-* Keyboard Maintainer: [melgeek001365](https://github.com/melgeek001365)
-* Hardware Supported: MJ65 REV3 20210120
-* Hardware Availability: [MelGeek](https://www.melgeek.com/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make melgeek/mj65/rev3:default
-
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
--- a/keyboards/melgeek/mj65/rev3/config.h
+++ b/keyboards/melgeek/mj65/rev3/config.h
@@ -1,39 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * 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
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 }
-#define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1, B14 }
-#define UNUSED_PINS
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define DRIVER_1_LED_TOTAL 76
-#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
-#define DRIVER_INDICATOR_LED_TOTAL 0
--- a/keyboards/melgeek/mj65/rev3/rev3.c
+++ b/keyboards/melgeek/mj65/rev3/rev3.c
@@ -1,139 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * 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 "mj65.h"
-
-#ifdef RGB_MATRIX_ENABLE
-
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB4 */
-    {0, CS9_SW5,  CS8_SW5,  CS7_SW5},  /* RGB5 */
-    {0, CS9_SW6,  CS8_SW6,  CS7_SW6},  /* RGB6 */
-    {0, CS9_SW7,  CS8_SW7,  CS7_SW7},  /* RGB7 */
-    {0, CS9_SW8,  CS8_SW8,  CS7_SW8},  /* RGB8 */
-    {0, CS9_SW9,  CS8_SW9,  CS7_SW9},  /* RGB9 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
-	{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
-	{0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
-	{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */
-    {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB73 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB74 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB75 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB76 */
-};
-
-led_config_t g_led_config = {
-	{
-		/* C0     C1         C2        C3        C4        C5        C6        C7        C8          C9        C10         C11        C12        C13    C14 */
-		{  0,      1,         2,        3,        4,        5,        6,        7,        8,          9,        10,         11,       12,        14,     16 },  /* R0 */
-		{ 17,     18,        19,       20,       21,       22,       23,       24,       25,         26,        27,         28,       29,        30,     31 },  /* R1 */
-		{ 32,     33,        34,       35,       36,       37,       38,       39,       40,         41,        42,         43,       45,        NO_LED, 47 },  /* R2 */
-		{ 49,     51,        52,       53,       54,       55,       56,       57,       58,         59,        60,         61,       62,        NO_LED, 63 },  /* R3 */
-		{ 64,     65,        66,       NO_LED,   NO_LED,   68,       NO_LED,   NO_LED,   NO_LED,     70,        71,         72,       73,        74,     75 },  /* R4 */
-    }, {
-        {0, 0},   {16, 0},   {32, 0},  {48, 0},  {64, 0},  {80, 0},  {96, 0},  {112, 0},  {128, 0},  {144, 0},  {160, 0},  {176, 0},  {192, 0},  {208, 0},  {224, 0},  {240, 0},  {255, 0},
-		{0, 16},  {16, 16},  {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16}, {224, 16}, {240, 16}, {255, 16},
-		{0, 32},  {16, 32},  {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32},
-		{0, 48},  {16, 48},  {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48},
-		{0, 64},  {16, 64},  {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {144, 64}, {160, 64}, {176, 64}, {192, 64}, {208, 64}, {224, 64},
-	}, {
-	       4,      4,         4,        4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,         4,         4,         4,
-		   4,      4,         4,        4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,         4,         4,         4,
-		   4,      4,         4,        4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,
-		   4,      4,         4,        4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,
-		   4,      4,         4,        4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,
-	}
-};
-
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
-
-#endif 
-
-void keyboard_pre_init_kb(void) {
-    setPinOutput(A2);
-    writePinHigh(A2);
-    keyboard_pre_init_user();
-}
--- a/keyboards/melgeek/mj65/rev3/rules.mk
+++ b/keyboards/melgeek/mj65/rev3/rules.mk
@@ -1,26 +0,0 @@
-# MCU name
-MCU = STM32F303
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = lite        # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes          # Mouse keys
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-CONSOLE_ENABLE = no            # Console for debug
-COMMAND_ENABLE = no            # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no          # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes              # USB Nkey Rollover
-BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no          # Enable Bluetooth
-RGB_MATRIX_ENABLE = yes        # Use RGB matrix
-RGB_MATRIX_DRIVER = IS31FL3741
-NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
-RGB_MATRIX_SUPPORTED = yes
-RGBLIGHT_SUPPORTED   = no
-BACKLIGHT_SUPPORTED  = no
-
-LAYOUTS = 65_ansi
--- a/keyboards/melgeek/mojo75/config.h
+++ b/keyboards/melgeek/mojo75/config.h
@@ -17,36 +17,3 @@
 #pragma once

 #include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xEDED
-#define PRODUCT_ID      0x7075
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    MelGeek
-#define PRODUCT         MOJO75
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 16
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 3
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define DISABLE_RGB_MATRIX_SPLASH
-#define DISABLE_RGB_MATRIX_MULTISPLASH
-#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
-//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#define DRIVER_ADDR_1 0b0110000
-#define DRIVER_ADDR_2 0b0110000 // this is here for compliancy reasons.
-#define DRIVER_COUNT 1
--- a/keyboards/melgeek/mojo75/rev1/config.h
+++ b/keyboards/melgeek/mojo75/rev1/config.h
@@ -16,6 +16,17 @@

 #pragma once

+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xEDED
+#define PRODUCT_ID      0x7075
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    MelGeek
+#define PRODUCT         MOJO75
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 16
+
 /*
 * Keyboard Matrix Assignments
 *
@@ -34,6 +45,27 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW

+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 3
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_LED_PROCESS_LIMIT 4
+#define RGB_MATRIX_LED_FLUSH_LIMIT 26
+#define DISABLE_RGB_MATRIX_SPLASH
+#define DISABLE_RGB_MATRIX_MULTISPLASH
+#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define DRIVER_ADDR_1 0b0110000
+#define DRIVER_ADDR_2 0b0110000 // this is here for compliancy reasons.
+#define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 92
 #define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
 #define DRIVER_INDICATOR_LED_TOTAL 0
--- a/keyboards/melgeek/mojo75/rev1/rev1.c
+++ b/keyboards/melgeek/mojo75/rev1/rev1.c
@@ -17,7 +17,6 @@
 #include "mojo75.h"

 #ifdef RGB_MATRIX_ENABLE
-
 const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0,  CS6_SW1,  CS5_SW1,  CS4_SW1}, /* RGB1 */
    {0,  CS6_SW2,  CS5_SW2,  CS4_SW2}, /* RGB2 */
@@ -28,13 +27,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0,  CS6_SW7,  CS5_SW7,  CS4_SW7}, /* RGB7 */
    {0,  CS6_SW8,  CS5_SW8,  CS4_SW8}, /* RGB8 */
    {0,  CS6_SW9,  CS5_SW9,  CS4_SW9}, /* RGB9 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB55 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB56 */
-	{0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB57 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB58 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB59 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB60 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB61 */
    {0,  CS9_SW1,  CS8_SW1,  CS7_SW1}, /* RGB10 */
    {0,  CS9_SW2,  CS8_SW2,  CS7_SW2}, /* RGB11 */
    {0,  CS9_SW3,  CS8_SW3,  CS7_SW3}, /* RGB12 */
@@ -44,14 +36,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0,  CS9_SW7,  CS8_SW7,  CS7_SW7}, /* RGB16 */
    {0,  CS9_SW8,  CS8_SW8,  CS7_SW8}, /* RGB17 */
    {0,  CS9_SW9,  CS8_SW9,  CS7_SW9}, /* RGB18 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB62 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB63 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB64 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB65 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB66 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB67 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB68 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB69 */
    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB19 */
    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB20 */
    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB21 */
@@ -61,12 +45,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB25 */
    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB26 */
    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB27 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB70 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB71 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB72 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB86 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB73 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB74 */
    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB28 */
    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB29 */
    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB30 */
@@ -76,13 +54,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB34 */
    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB35 */
    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB36 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB75 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB76 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB77 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB78 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB79 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB80 */
-    {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB91 */
    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB37 */
    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB38 */
    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB39 */
@@ -92,13 +63,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB43 */
    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB44 */
    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB45 */
-    {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB84 */
-    {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB83 */
-    {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB82 */
-    {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
-    {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB81 */
-    {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB87 */
-    {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB89 */
    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB46 */
 	{0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB47 */
    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB48 */
@@ -108,34 +72,69 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB52 */
    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB53 */
    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB54 */
+    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB55 */
+    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB56 */
+	{0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB57 */
+    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB58 */
+    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB59 */
+    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB60 */
+    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB61 */
+    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB62 */
+    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB63 */
+    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB64 */
+    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB65 */
+	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB66 */
+    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB67 */
+    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB68 */
+    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB69 */
+    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB70 */
+    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB71 */
+    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB72 */
+    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB73 */
+    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB74 */
+    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB75 */
+    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB76 */
+    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB77 */
+    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB78 */
+    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB79 */
+    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB80 */
+    {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB81 */
+    {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB82 */
+    {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB83 */
+    {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB84 */
+    {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
+    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB86 */
+    {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB87 */
+    {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB89 */
    {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB88 */
-    {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB92 */
    {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB90 */
+    {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB91 */
+    {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB92 */
 };

 led_config_t g_led_config = {
 	{
 		/* C0     C1         C2        C3        C4        C5        C6        C7        C8          C9        C10         C11        C12        C13        C14        C15   */
-		{  0,      1,         2,        3,        4,        5,        6,        7,        8,          9,        10,         11,       12,        13,        14,        15 }, /* R0 */
-		{ 16,     17,        18,       19,       20,       21,       22,       23,       24,         25,        26,         27,       28,        30,        NO_LED,    32 }, /* R1 */
-		{ 33,     34,        35,       36,       37,       38,       39,       40,       41,         42,        43,         44,       45,        46,        NO_LED,    47 }, /* R2 */
-		{ 48,     49,        50,       51,       52,       53,       54,       55,       56,         57,        58,         59,       NO_LED,    61,        NO_LED,    63 }, /* R3 */
-		{ 65,     67,        68,       69,       70,       71,       72,       73,       74,         75,        76,         NO_LED,   77,        NO_LED,    78,        79 }, /* R4 */
-		{ 80,     81,        82,       NO_LED,   NO_LED,   84,       NO_LED,   NO_LED,   NO_LED,     86,        87,         NO_LED,   88,        89,        90,        91 }, /* R5 */
+		{  0,      1,         2,        3,        4,        5,        6,        7,        8,         54,        55,         56,       57,        58,        59,        60 }, /* R0 */
+		{  9,     10,        11,       12,       13,       14,       15,       16,       17,         61,        62,         63,       64,        66,        67,        68 }, /* R1 */
+		{ 18,     19,        20,       21,       22,       23,       24,       25,       26,         69,        70,         71,       85,        72,        65,/*?*/   73 }, /* R2 */
+		{ 27,     28,        29,       30,       31,       32,       33,       34,       35,         74,        75,         76,       77,        78,        79,        90 }, /* R3 */
+		{ 36,     37,        38,       39,       40,       41,       42,       43,       44,         83,        82,         81,       84,        80,        86,        88 }, /* R4 */
+		{ 45,     46,        47,       48,       49,       NO_LED,   NO_LED,   50,       NO_LED,   NO_LED,      51,         52,       53,        87,        91,        89 }, /* R5 */
    }, {
-        {0,  0},  {16, 0},   {32, 0},  {48, 0},  {64, 0},  {80, 0},  {96, 0},  {112, 0},  {128, 0},  {144, 0},  {160, 0},  {176, 0},  {192, 0},  {208, 0},   {224, 0},  {240, 0},
-		{0, 16},  {16, 16},  {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16},  {224, 16}, {240, 16}, {255, 16},
-		{0, 32},  {16, 32},  {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32},  {224, 32},
+        {0,  0},   {16, 0},   {32, 0},  {48, 0},  {64, 0},  {80, 0},  {96, 0},  {112, 0},  {128, 0},  {144, 0},  {160, 0},  {176, 0},  {192, 0},  {208, 0},   {224, 0},  {240, 0},
+		{0, 16},  {16, 16},  {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16},  {224, 16}, {240, 16},
+		{0, 32},  {16, 32},  {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32},  {224, 32}, {240, 32},
 		{0, 48},  {16, 48},  {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48},  {224, 48}, {240, 48},
 		{0, 64},  {16, 64},  {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, {160, 64}, {176, 64}, {192, 64}, {208, 64},  {224, 64}, {240, 64},
-		{0, 80},  {16, 80},  {32, 80}, {48, 80}, {64, 80}, {80, 80}, {96, 80}, {112, 80}, {128, 80}, {144, 80}, {160, 80}, {176, 80},
+		{0, 80},  {16, 80},  {32, 80}, {48, 80}, {64, 80},                     {80, 80},                        {96, 80},  {112, 80}, {128, 80}, {144, 80}, {160, 80},  {176, 80},
 	}, {
-	     4,        4,         4,        4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,          4,         4,
-	     4,        4,         4,        4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,          4,         4,        4,
-	     4,        4,         4,        4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,          4,
-	     4,        4,         4,        4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,          4,         4,
-		 4,        4,         4,        4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,          4,         4,
-		 4,        4,         4,        4,        4,        4,        4,        4,         4,         4,         4,         4,
+	       4,       4,         4,        4,        4,        4,        4,        4,         4,         4,         4,          4,        4,        4,          4,         4,
+	       4,       4,         4,        4,        4,        4,        4,        4,         4,         4,         4,          4,        4,        4,          4,         4,
+	       4,       4,         4,        4,        4,        4,        4,        4,         4,         4,         4,          4,        4,        4,          4,         4,
+	       4,       4,         4,        4,        4,        4,        4,        4,         4,         4,         4,          4,        4,        4,          4,         4,
+		   4,       4,         4,        4,        4,        4,        4,        4,         4,         4,         4,          4,        4,        4,          4,         4,
+		   4,       4,         4,        4,        4,                            4,                               4,          4,        4,        4,          4,         4,
 	}
 };

--- a/keyboards/melgeek/mojo75/rev1/rules.mk
+++ b/keyboards/melgeek/mojo75/rev1/rules.mk
@@ -19,5 +19,3 @@ BLUETOOTH_ENABLE = no          # Enable Bluetooth
 RGB_MATRIX_ENABLE = yes        # Use RGB matrix
 RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
-
-LAYOUTS = 75_ansi
--- a/keyboards/miuni32/keymaps/kifinnsson/config.h
+++ b/keyboards/miuni32/keymaps/kifinnsson/config.h
--- a/keyboards/miuni32/keymaps/kifinnsson/keymap.c
+++ b/keyboards/miuni32/keymaps/kifinnsson/keymap.c
--- a/keyboards/miuni32/keymaps/kifinnsson/readme.md
+++ b/keyboards/miuni32/keymaps/kifinnsson/readme.md
--- a/keyboards/miuni32/keymaps/kifinnsson/rules.mk
+++ b/keyboards/miuni32/keymaps/kifinnsson/rules.mk
--- a/keyboards/noxary/220/config.h
+++ b/keyboards/noxary/220/config.h
@@ -21,12 +21,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x4E58 //"NX"
-#define PRODUCT_ID      0x0899 //2201
+#define PRODUCT_ID      0x00DC //220
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Noxary
 #define PRODUCT         220

-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4
--- a/keyboards/noxary/260/config.h
+++ b/keyboards/noxary/260/config.h
@@ -20,13 +20,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"

 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x4E58 //"NX"
-#define PRODUCT_ID      0x0A29 //2601
+#define VENDOR_ID       0x4E58
+#define PRODUCT_ID      0x003C
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Noxary
 #define PRODUCT         260

-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
--- a/keyboards/noxary/268/config.h
+++ b/keyboards/noxary/268/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x4E58 //"NX"
-#define PRODUCT_ID      0x0A79 //2681
+#define PRODUCT_ID      0x010C //268
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Noxary
 #define PRODUCT         268
--- a/keyboards/noxary/268_2/config.h
+++ b/keyboards/noxary/268_2/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x4E58 //"NX"
-#define PRODUCT_ID      0x0A7A //2682
+#define PRODUCT_ID      0x010C //268
 #define DEVICE_VER      0x0002
 #define MANUFACTURER    Noxary
 #define PRODUCT         268.2
--- a/keyboards/noxary/280/config.h
+++ b/keyboards/noxary/280/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x4E58 //"NX"
-#define PRODUCT_ID      0x0AF1 //2801
+#define PRODUCT_ID      0x0118 //280
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Noxary
 #define PRODUCT         280
--- a/keyboards/noxary/x268/config.h
+++ b/keyboards/noxary/x268/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x4E58 //"NX"
-#define PRODUCT_ID      0x0A7B //2683
+#define PRODUCT_ID      0x010C //268
 #define DEVICE_VER      0x0078 //"x"
 #define MANUFACTURER    Noxary
 #define PRODUCT         x268
--- a/keyboards/nullbitsco/nibble/keymaps/default/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/default/keymap.c
@@ -15,10 +15,8 @@
 */
 #include QMK_KEYBOARD_H

-enum layer_names {
-  _MA,
-  _FN
-};
+#define _MA 0
+#define _FN 1

 enum custom_keycodes {
  KC_CUST = SAFE_RANGE,
@@ -26,14 +24,14 @@ enum custom_keycodes {

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_MA] = LAYOUT_ansi(
-            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_EQL,  KC_BSPC, KC_HOME,
+            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_EQL,  KC_BSPC, KC_TILD,
    KC_F13, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
    KC_F14, KC_CAPS, 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_PGUP,
    KC_F15, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
    KC_F16, KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    MO(_FN), KC_RALT, KC_RCTL, KC_LEFT,          KC_DOWN, KC_RGHT
  ),
  [_FN] = LAYOUT_ansi(
-               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, _______,  KC_END,
+               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, KC_HOME,  KC_INS,
    RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
@@ -70,7 +68,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
      if (record->event.pressed) {
      }
    break;
-
+    
  }
 return true;
 }
@@ -102,10 +100,10 @@ void change_RGB(bool clockwise) {
        } else {
            rgblight_step_reverse();
        }
-    }
+    } 
 }

-void encoder_update_user(uint8_t index, bool clockwise) {
+void encoder_update_kb(uint8_t index, bool clockwise) {
  if (layer_state_is(1)) {
    //change RGB settings
    change_RGB(clockwise);
@@ -115,7 +113,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
      tap_code(KC_VOLU);
  } else {
      tap_code(KC_VOLD);
-    }
+    }  
  }
 }

@@ -127,4 +125,4 @@ void matrix_init_user(void) {
 void matrix_scan_user(void) {
  // Scan and parse keystrokes from remote keyboard, if connected (see readme)
  matrix_scan_remote_kb();
-}
+}
--- a/keyboards/nullbitsco/nibble/keymaps/iso/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/iso/keymap.c
@@ -15,10 +15,8 @@
 */
 #include QMK_KEYBOARD_H

-enum layer_names {
-  _MA,
-  _FN
-};
+#define _MA 0
+#define _FN 1

 enum custom_keycodes {
  KC_CUST = SAFE_RANGE,
@@ -105,7 +103,7 @@ void change_RGB(bool clockwise) {
    }
 }

-void encoder_update_user(uint8_t index, bool clockwise) {
+void encoder_update_kb(uint8_t index, bool clockwise) {
  if (layer_state_is(1)) {
    //change RGB settings
    change_RGB(clockwise);
--- a/keyboards/nullbitsco/nibble/keymaps/oled/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/oled/keymap.c
@@ -15,10 +15,8 @@
 */
 #include QMK_KEYBOARD_H

-enum layer_names {
-  _MA,
-  _FN
-};
+#define _MA 0
+#define _FN 1

 enum custom_keycodes {
    KC_CUST = SAFE_RANGE,
@@ -26,14 +24,14 @@ enum custom_keycodes {

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [_MA] = LAYOUT_ansi(
-                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_EQL,  KC_BSPC, KC_HOME,
+                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_EQL,  KC_BSPC, KC_TILD,
        KC_F13, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
        KC_F14, KC_CAPS, 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_PGUP,
        KC_F15, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
        KC_F16, KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    MO(_FN), KC_RALT, KC_RCTL, KC_LEFT,          KC_DOWN, KC_RGHT
    ),
    [_FN] = LAYOUT_ansi(
-                 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,  _______,  KC_END,
+                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, KC_HOME,  KC_INS,
        RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
@@ -46,37 +44,37 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_

 static void render_logo(void) {
    static const char PROGMEM nibble_logo[] = {
-        0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff,
-        0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
-        0x1f, 0x1f, 0x1f, 0x3f, 0x3e, 0xfe, 0xfe, 0xfc, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0xfe,
-        0xfe, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3e, 0xfe, 0xfe,
-        0xfc, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xff, 0xff, 0xff,
-        0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1e, 0x0c, 0x00,
-        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x0f, 0x1f, 0x7f, 0xff, 0xfe, 0xf8, 0xf0, 0xc0, 0x80,
-        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
-        0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xfc, 0xff, 0xff, 0xbf, 0x1f, 0x07, 0x00, 0x00, 0x00, 0x00, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xff, 0xff,
-        0xff, 0xbf, 0x1f, 0x03, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x00, 0x00,
-        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x7f, 0xff,
-        0xfe, 0xfc, 0xf0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03,
-        0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xe0, 0x00, 0x00, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0x0f,
-        0xff, 0xff, 0xff, 0xfe, 0xf8, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00,
-        0x00, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x03, 0x07, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff,
-        0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
-        0xf8, 0xf8, 0xf8, 0xf8, 0x7c, 0x7c, 0x7e, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x7f,
-        0x7f, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0x7c, 0x7c, 0x7e,
-        0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x1f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8,
-        0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0x78, 0x30, 0x3f, 0x7f, 0xff, 0xff, 0xff,
+        0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 
+        0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 
+        0x1f, 0x1f, 0x1f, 0x3f, 0x3e, 0xfe, 0xfe, 0xfc, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0xfe, 
+        0xfe, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3e, 0xfe, 0xfe, 
+        0xfc, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xff, 0xff, 0xff, 
+        0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1e, 0x0c, 0x00, 
+        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x0f, 0x1f, 0x7f, 0xff, 0xfe, 0xf8, 0xf0, 0xc0, 0x80, 
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
+        0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 
+        0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xfc, 0xff, 0xff, 0xbf, 0x1f, 0x07, 0x00, 0x00, 0x00, 0x00, 0xff, 
+        0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xff, 0xff, 
+        0xff, 0xbf, 0x1f, 0x03, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 
+        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x7f, 0xff, 
+        0xfe, 0xfc, 0xf0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
+        0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 
+        0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xe0, 0x00, 0x00, 0xff, 
+        0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0x0f, 
+        0xff, 0xff, 0xff, 0xfe, 0xf8, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 
+        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 
+        0x00, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x03, 0x07, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 
+        0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 
+        0xf8, 0xf8, 0xf8, 0xf8, 0x7c, 0x7c, 0x7e, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x7f, 
+        0x7f, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0x7c, 0x7c, 0x7e, 
+        0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x1f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 
+        0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0x78, 0x30, 0x3f, 0x7f, 0xff, 0xff, 0xff, 
        0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0x78, 0x30, 0x00
    };
    // Host Keyboard Layer Status
@@ -116,13 +114,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
        if (record->event.pressed) {
        }
        break;
-
+        
    }
    return true;
 }


-void encoder_update_user(uint8_t index, bool clockwise) {
+void encoder_update_kb(uint8_t index, bool clockwise) {
    if (clockwise) {
        tap_code(KC_VOLU);
    } else {
@@ -138,4 +136,4 @@ void matrix_init_user(void) {
 void matrix_scan_user(void) {
    // Scan and parse keystrokes from remote keyboard, if connected (see readme)
    matrix_scan_remote_kb();
-}
+}
--- a/keyboards/kbdfans/kbd75/keymaps/noroadsleft/config.h
+++ b/keyboards/kbdfans/kbd75/keymaps/noroadsleft/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 James Young (@noroadsleft)
+/* Copyright 2020 Jay Greco
 *
 * 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
@@ -13,12 +13,9 @@
 * 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
-
-#undef MANUFACTURER
-#undef PRODUCT
-#define MANUFACTURER    KBDfans
-#define PRODUCT         KBD75 rev1
-
-#define BACKLIGHT_BREATHING
+// Custom config starts after VIA's EEPROM usage,
+// dynamic keymaps start after this.
+// Custom config Usage:
+// 1 for enabled encoder modes (1 byte)
+// 6 for 3x custom encoder settings, left, right, and press (18 bytes)
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 19
--- a/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
@@ -14,13 +14,12 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include QMK_KEYBOARD_H
+#include "via_extras.h"

-enum layer_names {
-  _BASE,
-  _VIA1,
-  _VIA2,
-  _VIA3
-};
+#define _BASE     0
+#define _VIA1     1
+#define _VIA2     2
+#define _VIA3     3

 #define KC_DISC_MUTE KC_F23
 #define KC_DISC_DEAF KC_F24
@@ -51,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  ),

  [_VIA1] = LAYOUT_all(
-              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,  _______,  KC_END,
+              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, KC_HOME,  KC_INS,
    RGB_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -101,7 +100,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
      if (record->event.pressed) {
        tap_code(KC_DISC_MUTE);
        if (!rgblight_is_enabled()) break;
-
+        
        if (muted) {
          rgblight_enable_noeeprom();
        } else {
@@ -134,7 +133,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
        if (!is_alt_tab_active) {
          is_alt_tab_active = true;
          register_code(KC_LALT);
-        }
+        } 
        alt_tab_timer = timer_read();
        register_code(KC_TAB);
      } else {
@@ -143,20 +142,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
      break;

    default:
-    break;
+    break;    
  }
 return true;
 }

-void encoder_update_user(uint8_t index, bool clockwise) {
-  // Encoder is mapped to volume functions by default
-  if (clockwise) {
-    tap_code(KC_VOLU);
-  } else {
-    tap_code(KC_VOLD);
-  }
-}
-
 void matrix_init_user(void) {
  // Initialize remote keyboard, if connected (see readme)
  matrix_init_remote_kb();
@@ -171,4 +161,4 @@ void matrix_scan_user(void) {
      is_alt_tab_active = false;
    }
  }
-}
+}
--- a/keyboards/nullbitsco/nibble/keymaps/via/nibble_encoder.c
+++ b/keyboards/nullbitsco/nibble/keymaps/via/nibble_encoder.c
@@ -0,0 +1,133 @@
+/* Copyright 2020 Jay Greco
+ *
+ * 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 "nibble_encoder.h"
+
+uint8_t encoder_value = 0x20,
+  encoder_mode = ENC_MODE_VOLUME,
+  enabled_encoder_modes = 0x1F;
+
+uint16_t retrieve_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior) {
+#ifdef DYNAMIC_KEYMAP_ENABLE
+    void* addr = (void*)(EEPROM_CUSTOM_ENCODER + (encoder_idx * 6) + (behavior * 2));
+    uint16_t keycode = eeprom_read_byte(addr) << 8;
+    keycode |= eeprom_read_byte(addr + 1);
+    return keycode;
+#else
+    return 0;
+#endif
+}
+
+void set_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior, uint16_t new_code) {
+#ifdef DYNAMIC_KEYMAP_ENABLE
+    void* addr = (void*)(EEPROM_CUSTOM_ENCODER + (encoder_idx * 6) + (behavior * 2));
+    eeprom_update_byte(addr, (uint8_t)(new_code >> 8));
+    eeprom_update_byte(addr + 1, (uint8_t)(new_code & 0xFF));
+#endif
+}
+
+void pre_encoder_mode_change(void) {
+	dprintf("Changing encoder mode: %u\n", encoder_mode);
+}
+
+void post_encoder_mode_change(void) {
+	dprintf("Encoder mode: %u\n", encoder_mode);
+}
+
+//???
+void change_encoder_mode(bool clockwise) {
+  pre_encoder_mode_change();
+  if(enabled_encoder_modes == 0){
+    enabled_encoder_modes = 0x1F;
+  }
+  do {
+    if(!clockwise){
+      if (encoder_mode == 0){
+        encoder_mode = _NUM_ENCODER_MODES - 1;
+      } else{
+        encoder_mode = encoder_mode - 1;
+      }
+    } else {
+        encoder_mode = (encoder_mode + 1) % _NUM_ENCODER_MODES;
+    }
+  } while(((1 << encoder_mode) & enabled_encoder_modes) == 0);
+  post_encoder_mode_change();
+}
+
+uint16_t handle_encoder_cw(void) {
+	dprintf("Encoder mode: %u\n", encoder_mode);
+  uint16_t mapped_code = 0;
+  switch(encoder_mode){
+    default:
+    	break;
+    case ENC_MODE_VOLUME:
+      mapped_code = KC_VOLU;
+      break;
+    case ENC_MODE_MEDIA:
+      mapped_code = KC_MEDIA_NEXT_TRACK;
+      break;
+    case ENC_MODE_SCROLL:
+      mapped_code = KC_WH_D;
+      break;
+    case ENC_MODE_BACKLIGHT:
+      mapped_code = RGB_VAI;
+      break;
+#ifdef DYNAMIC_KEYMAP_ENABLE
+    case ENC_MODE_CUSTOM0:
+      mapped_code = retrieve_custom_encoder_config(0, ENC_CUSTOM_CW);
+      break;
+    case ENC_MODE_CUSTOM1:
+      mapped_code = retrieve_custom_encoder_config(1, ENC_CUSTOM_CW);
+      break;
+    case ENC_MODE_CUSTOM2:
+      mapped_code = retrieve_custom_encoder_config(2, ENC_CUSTOM_CW);
+      break;
+#endif
+  }
+  return mapped_code;
+}
+
+uint16_t handle_encoder_ccw(void) {
+	dprintf("Encoder mode: %u\n", encoder_mode);
+  uint16_t mapped_code = 0;
+  switch(encoder_mode){
+    default:
+    	break;
+    case ENC_MODE_VOLUME:
+      mapped_code = KC_VOLD;
+      break;
+    case ENC_MODE_MEDIA:
+      mapped_code = KC_MEDIA_PREV_TRACK;
+      break;
+    case ENC_MODE_SCROLL:
+      mapped_code = KC_WH_U;
+      break;
+    case ENC_MODE_BACKLIGHT:
+      mapped_code = RGB_VAD;
+      break;
+#ifdef DYNAMIC_KEYMAP_ENABLE
+    case ENC_MODE_CUSTOM0:
+      mapped_code = retrieve_custom_encoder_config(0, ENC_CUSTOM_CCW);
+      break;
+    case ENC_MODE_CUSTOM1:
+      mapped_code = retrieve_custom_encoder_config(1, ENC_CUSTOM_CCW);
+      break;
+    case ENC_MODE_CUSTOM2:
+      mapped_code = retrieve_custom_encoder_config(2, ENC_CUSTOM_CCW);
+      break;
+#endif
+  }
+  return mapped_code;
+}
--- a/keyboards/nullbitsco/nibble/keymaps/via/nibble_encoder.h
+++ b/keyboards/nullbitsco/nibble/keymaps/via/nibble_encoder.h
@@ -0,0 +1,50 @@
+/* Copyright 2020 Jay Greco
+ *
+ * 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 QMK_KEYBOARD_H
+#include "eeprom.h"
+
+#define EEPROM_ENABLED_ENCODER_MODES (VIA_EEPROM_CUSTOM_CONFIG_ADDR)
+#define EEPROM_CUSTOM_ENCODER (VIA_EEPROM_CUSTOM_CONFIG_ADDR+1)
+
+enum encoder_modes {
+  ENC_MODE_VOLUME,
+  ENC_MODE_MEDIA,
+  ENC_MODE_SCROLL,
+  ENC_MODE_BRIGHTNESS,
+  ENC_MODE_BACKLIGHT,
+  ENC_MODE_CUSTOM0,
+  ENC_MODE_CUSTOM1,
+  ENC_MODE_CUSTOM2,
+  _NUM_ENCODER_MODES,
+};
+
+enum custom_encoder_behavior {
+    ENC_CUSTOM_CW = 0,
+    ENC_CUSTOM_CCW,
+    ENC_CUSTOM_PRESS
+};
+
+uint16_t 
+  retrieve_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior),
+  handle_encoder_cw(void),
+  handle_encoder_ccw(void);
+
+void set_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior, uint16_t new_code),
+  pre_encoder_mode_change(void),
+  post_encoder_mode_change(void),
+  change_encoder_mode(bool clockwise);
--- a/keyboards/nullbitsco/nibble/keymaps/via/rules.mk
+++ b/keyboards/nullbitsco/nibble/keymaps/via/rules.mk
@@ -1 +1,4 @@
-VIA_ENABLE = yes
+VIA_ENABLE = yes
+
+SRC += keymaps/via/nibble_encoder.c
+SRC += keymaps/via/via_extras.c
--- a/keyboards/nullbitsco/nibble/keymaps/via/via_extras.c
+++ b/keyboards/nullbitsco/nibble/keymaps/via/via_extras.c
@@ -0,0 +1,129 @@
+/* Copyright 2020 Jay Greco
+ *
+ * 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 "via_extras.h"
+
+// Encoder Behavior
+extern uint8_t encoder_value;
+extern uint8_t encoder_mode;
+extern uint8_t enabled_encoder_modes;
+
+void raw_hid_receive_kb( uint8_t *data, uint8_t length )
+{
+  uint8_t *command_id = &(data[0]);
+  uint8_t *command_data = &(data[1]);
+  dprintf("raw hid recv! command_id: %u\n",*command_id);
+  switch ( *command_id )
+  {
+    case id_get_keyboard_value:
+    {
+      switch( command_data[0])
+      {
+        case id_encoder_modes:
+        {
+          command_data[1] = enabled_encoder_modes;
+          dprintf("[read] enabled_encoder_modes: %u\n", enabled_encoder_modes);
+        }
+        break;
+
+        case id_encoder_custom:
+        {
+          uint8_t custom_encoder_idx = command_data[1];
+          uint16_t keycode = retrieve_custom_encoder_config(custom_encoder_idx, ENC_CUSTOM_CW);
+          command_data[2] =  keycode >> 8;
+          command_data[3] = keycode & 0xFF;
+          keycode = retrieve_custom_encoder_config(custom_encoder_idx, ENC_CUSTOM_CCW);
+          command_data[4] =  keycode >> 8;
+          command_data[5] = keycode & 0xFF;
+          keycode = retrieve_custom_encoder_config(custom_encoder_idx, ENC_CUSTOM_PRESS);
+          command_data[6] =  keycode >> 8;
+          command_data[7] = keycode & 0xFF;
+        }
+        break;
+
+        default:
+        {
+          *command_id = id_unhandled;
+        }
+        break;
+      }
+    }
+    break;
+    case id_set_keyboard_value:
+    {
+      switch(command_data[0]){
+        case id_encoder_modes:
+        {
+          enabled_encoder_modes = command_data[1];
+          dprintf("[write] enabled_encoder_modes: %u\n", enabled_encoder_modes);
+          eeprom_update_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES, enabled_encoder_modes);
+        }
+        break;
+
+        case id_encoder_custom:
+        {
+          uint8_t custom_encoder_idx = command_data[1];
+          uint8_t encoder_behavior = command_data[2];
+          uint16_t keycode = (command_data[3] << 8) | command_data[4];
+          set_custom_encoder_config(custom_encoder_idx, encoder_behavior, keycode);
+        }
+        break;
+
+        default:
+        {
+          *command_id = id_unhandled;
+        }
+        break;
+      }
+    }
+    break;
+
+    default:
+    {
+      // Unhandled message.
+      *command_id = id_unhandled;
+    }
+    break;
+  }
+}
+
+void encoder_update_kb(uint8_t index, bool clockwise) {
+  if (layer_state_is(1)) {
+    change_encoder_mode(clockwise);
+    return;
+  }
+  uint16_t mapped_code = 0;
+  if (clockwise) {
+    mapped_code = handle_encoder_cw();
+  } else {
+    mapped_code = handle_encoder_ccw();
+  }
+  if(mapped_code != 0){
+    tap_code16(mapped_code);
+  }
+}
+
+void custom_config_load(void){
+#ifdef DYNAMIC_KEYMAP_ENABLE
+  enabled_encoder_modes = eeprom_read_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES);
+#endif
+}
+
+void via_init_kb(void)
+{
+  dprintf("VIA is enabled.\n");
+  custom_config_load();
+}
--- a/keyboards/nullbitsco/nibble/keymaps/via/via_extras.h
+++ b/keyboards/nullbitsco/nibble/keymaps/via/via_extras.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 James Young (@noroadsleft)
+/* Copyright 2020 Jay Greco
 *
 * 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
@@ -13,26 +13,27 @@
 * 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 QMK_KEYBOARD_H
+#include "nibble_encoder.h"
+#include "via.h"
+#include "raw_hid.h"
+#include "dynamic_keymap.h"
+#include "tmk_core/common/eeprom.h"

-#define MOD_MASK_RALT (MOD_BIT(KC_RALT))
-extern bool macroMode;
-
-enum userspace_keycodes {
-    VRSN = SAFE_RANGE,
-    G_PUSH,
-    G_FTCH,
-    G_BRCH,
-    M_SALL,
-    M_UNDO,
-    M_CUT,
-    M_COPY,
-    M_PASTE,
-    M_MDSWP,
-    KEYMAP_SAFE_RANGE
+enum nibble_keyboard_value_id {
+  id_encoder_modes = 0x80,
+  id_unused_mode_1,
+  id_encoder_custom,
+  id_unused_mode_2
 };

-bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
+// Encoder Behavior
+extern uint8_t encoder_value,
+  encoder_mode,
+  enabled_encoder_modes;
+
+void raw_hid_receive_kb(uint8_t *data, uint8_t length),
+  encoder_update_kb(uint8_t index, bool clockwise),
+  custom_config_load(void),
+  via_init_kb(void);
--- a/keyboards/planck/keymaps/dear_vehicle_owner/config.h
+++ b/keyboards/planck/keymaps/dear_vehicle_owner/config.h
@@ -1,57 +0,0 @@
-/* Copyright 2021 Timothy Beck
-  *
-  * 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
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-    // #define STARTUP_SONG SONG(NO_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
-
-/*
- * MIDI options
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-// Most tactile encoders have detents every 4 stages
-#define ENCODER_RESOLUTION 4
-
-//switch polling rate to 1000 per second
-#define USB_POLLING_INTERVAL_MS 1
--- a/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
+++ b/keyboards/planck/keymaps/dear_vehicle_owner/keymap.c
@@ -1,358 +0,0 @@
-/* Copyright 2021 Timothy Beck
- *
- * 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
-#include "muse.h"
-
-
-enum planck_layers {
-    _QWERTY,
-    _COLEMAK,
-    _DVORAK,
-    _LOWER,
-    _RAISE,
-    _PLOVER,
-    _ADJUST
-};
-
-enum planck_keycodes {
-    QWERTY = SAFE_RANGE,
-    COLEMAK,
-    DVORAK,
-    PLOVER,
-    BACKLIT,
-    EXT_PLV,
-    DR_VO
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_grid(
-    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 ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_grid(
-    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DR_VO| DR_VO| DR_VO| DR_VO|      |             |      | DR_VO| DR_VO| DR_VO| DR_VO|
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_grid(
-    DR_VO, DR_VO, DR_VO, DR_VO,   DR_VO,   DR_VO,   DR_VO,   DR_VO, DR_VO, DR_VO, DR_VO, DR_VO,
-    DR_VO, DR_VO, DR_VO, DR_VO,   DR_VO,   DR_VO,   DR_VO,   DR_VO, DR_VO, DR_VO, DR_VO, DR_VO,
-    DR_VO, DR_VO, DR_VO, DR_VO,   DR_VO,   DR_VO,   DR_VO,   DR_VO, DR_VO, DR_VO, DR_VO, DR_VO,
-    DR_VO, DR_VO, DR_VO, DR_VO, _______, _______, _______, _______, DR_VO, DR_VO, DR_VO, DR_VO
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO| DR_VO|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | DR_VO| DR_VO| DR_VO| DR_VO|      |             |      | DR_VO| DR_VO| DR_VO| DR_VO|
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_grid(
-    DR_VO, DR_VO, DR_VO, DR_VO,   DR_VO,   DR_VO,   DR_VO,   DR_VO, DR_VO, DR_VO, DR_VO, DR_VO,
-    DR_VO, DR_VO, DR_VO, DR_VO,   DR_VO,   DR_VO,   DR_VO,   DR_VO, DR_VO, DR_VO, DR_VO, DR_VO,
-    DR_VO, DR_VO, DR_VO, DR_VO,   DR_VO,   DR_VO,   DR_VO,   DR_VO, DR_VO, DR_VO, DR_VO, DR_VO,
-    DR_VO, DR_VO, DR_VO, DR_VO, _______, _______, _______, _______, DR_VO, DR_VO, DR_VO, DR_VO
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_PLOVER] = LAYOUT_planck_grid(
-    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
-    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_grid(
-    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
-    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
-)
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-        #ifdef KEYBOARD_planck_rev5
-          writePinLow(E6);
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-        #ifdef KEYBOARD_planck_rev5
-          writePinHigh(E6);
-        #endif
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-    case DR_VO:
-            if (record->event.pressed) {
-                SEND_STRING("We've been trying to reach you concerning your vehicle's extended warranty. You should've received a notice in the mail about your car's extended warranty eligibility. Since we've not gotten a response, we're giving you a final courtesy call before we close out your file. Press 2 to be removed and placed on our do-not-call list. To speak to someone about possibly extending or reinstating your vehicle's warranty, press 1 to speak with a warranty specialist.\n");
-            }
-            return false;
-            break;
-  }
-  return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-void encoder_update(bool clockwise) {
-  if (muse_mode) {
-    if (IS_LAYER_ON(_RAISE)) {
-      if (clockwise) {
-        muse_offset++;
-      } else {
-        muse_offset--;
-      }
-    } else {
-      if (clockwise) {
-        muse_tempo+=1;
-      } else {
-        muse_tempo-=1;
-      }
-    }
-  } else {
-    if (clockwise) {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_DOWN);
-      #else
-        tap_code(KC_PGDN);
-      #endif
-    } else {
-      #ifdef MOUSEKEY_ENABLE
-        tap_code(KC_MS_WH_UP);
-      #else
-        tap_code(KC_PGUP);
-      #endif
-    }
-  }
-}
-
-void dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-        case 0: {
-#ifdef AUDIO_ENABLE
-            static bool play_sound = false;
-#endif
-            if (active) {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_song); }
-#endif
-                layer_on(_ADJUST);
-            } else {
-#ifdef AUDIO_ENABLE
-                if (play_sound) { PLAY_SONG(plover_gb_song); }
-#endif
-                layer_off(_ADJUST);
-            }
-#ifdef AUDIO_ENABLE
-            play_sound = true;
-#endif
-            break;
-        }
-        case 1:
-            if (active) {
-                muse_mode = true;
-            } else {
-                muse_mode = false;
-            }
-    }
-}
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-  switch (keycode) {
-    case RAISE:
-    case LOWER:
-      return false;
-    default:
-      return true;
-  }
-}
--- a/keyboards/planck/keymaps/dear_vehicle_owner/readme.md
+++ b/keyboards/planck/keymaps/dear_vehicle_owner/readme.md
@@ -1,4 +0,0 @@
-# dear vehicle owner
-
-We've been trying to reach you concerning your vehicle's extended warranty. You should've received a notice in the mail about your car's extended warranty eligibility. Since we've not gotten a response, we're giving you a final courtesy call before we close out your file. Press 2 to be removed and placed on our do-not-call list. To speak to someone about possibly extending or reinstating your vehicle's warranty, press 1 to speak with a warranty specialist.
-
--- a/keyboards/planck/keymaps/dear_vehicle_owner/rules.mk
+++ b/keyboards/planck/keymaps/dear_vehicle_owner/rules.mk
@@ -1,2 +0,0 @@
-SRC += muse.c
-DEBOUNCE_TYPE = sym_eager_pk
--- a/keyboards/planck/keymaps/stuartfong1/config.h
+++ b/keyboards/planck/keymaps/stuartfong1/config.h
@@ -1,29 +0,0 @@
-/* Copyright 2020 Stuart Fong
- *
- * 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
-#define MIDI_BASIC
-#define DYNAMIC_MACRO_NO_NESTING
-#define AUTO_SHIFT_TIMEOUT 175
-
-#ifdef AUDIO_ENABLE
-    #define STARTUP_SONG SONG(PLANCK_SOUND)
-
-    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-                                }
-#endif
--- a/keyboards/planck/keymaps/stuartfong1/keymap.c
+++ b/keyboards/planck/keymaps/stuartfong1/keymap.c
@@ -1,318 +0,0 @@
-/* Copyright 2020 Stuart Fong
- *
- * 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
-#include "muse.h"
-
-enum planck_layers 
-{
-    _COLEMAK,
-    _PLOVER,
-    _LOWER,
-    _RAISE,
-    _SYMBOL,
-    _FUNCTION,
-    _ADJUST
-};
-
-enum planck_keycodes {
-    COLEMAK = SAFE_RANGE,
-    PLOVER,
-    EXT_PLV,
-    CBR,  // {}
-    PRN,  // ()
-    BRC,  // []
-    DQUO, // ""
-    PRTSC3, // Capture Entire Screen
-    PRTSC4, // Capture Selected Portion
-    PRTSC5  // Screenshot Toolbar
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-#define SYMBOL MO(_SYMBOL)
-#define FUNCTION MO(_FUNCTION)
-
-#define LTL LT(LOWER, KC_BSPC)
-#define LTS LT(SYMBOL, KC_TAB)
-#define LTF LT(FUNCTION, KC_ENT)
-#define LTR LT(RAISE, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = 
-{
-    /* Colemak
-     * ,-----------------------------------------------------------------------------------.
-     * |   Q  |   W  |   F  |   P  |   B  |Macro1|Macro2|   J  |   L  |   U  |   Y  |   ;  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   A  |   R  |   S  |   T  |   G  |Play 1|Play 2|   M  |   N  |   E  |   I  |   O  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   Z  |   X  |   C  |   D  |   V  | Shift| Shift|   K  |   H  |   ,  |   .  |   /  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Ctrl | Alt  | GUI  | Bksp |  Tab | Caps |  Esc | Enter| Space|  GUI |  Alt | Ctrl |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_COLEMAK] = LAYOUT_planck_grid(
-        KC_Q,    KC_W,    KC_F,    KC_P, KC_B, DM_REC1, DM_REC2, KC_J, KC_L, KC_U,    KC_Y,    KC_SCLN, 
-        KC_A,    KC_R,    KC_S,    KC_T, KC_G, DM_PLY1, DM_PLY2, KC_M, KC_N, KC_E,    KC_I,    KC_O, 
-        KC_Z,    KC_X,    KC_C,    KC_D, KC_V, KC_LSFT, KC_RSFT, KC_K, KC_H, KC_COMM, KC_DOT,  KC_SLSH, 
-        KC_LCTL, KC_LALT, KC_LGUI, LTL,  LTS,  KC_CAPS, KC_ESC,  LTF,  LTR,  KC_RGUI, KC_RALT, KC_RCTL
-    ),
-
-    /* Plover layer (http://opensteno.org)
-     * ,-----------------------------------------------------------------------------------.
-     * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  Tab |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Enter|   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Exit |  Up  | Down |   A  |   O  | Bksp | Space|   E  |   U  | Left | Right|  Esc |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_PLOVER] = LAYOUT_planck_grid(
-        KC_1,    KC_1,    KC_1,    KC_1, KC_1, KC_1,    KC_1,    KC_1, KC_1, KC_1,     KC_1,    KC_1,
-        KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T,    KC_Y,    KC_U, KC_I, KC_O,     KC_P,    KC_LBRC,
-        KC_ENT,  KC_A,    KC_S,    KC_D, KC_F, KC_G,    KC_H,    KC_J, KC_K, KC_L,     KC_SCLN, KC_QUOT,
-        EXT_PLV, KC_UP,   KC_DOWN, KC_C, KC_V, KC_BSPC, KC_SPC,  KC_N, KC_M, KC_LEFT,  KC_RGHT, KC_ESC
-    ),
-
-    /* Lower
-     * ,-----------------------------------------------------------------------------------.
-     * |   -  |   '  |   ;  |  {}  |   %  |      |      |   +  |   7  |   8  |   9  |   .  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   _  |   "  |   =  |  ()  |   /  |      |      |   -  |   4  |   5  |   6  |   0  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   \  |   &  |   !  |  []  |   ^  |      |      |   *  |   1  |   2  |   3  |   ,  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      | Enter| Space| Bksp |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_LOWER] = LAYOUT_planck_grid(
-        KC_MINS, KC_QUOT, KC_SCLN, CBR,     KC_PERC, XXXXXXX, XXXXXXX, KC_PPLS, KC_P7, KC_P8,   KC_P9,   KC_DOT, 
-        KC_UNDS, DQUO,    KC_PEQL, PRN,     KC_PSLS, XXXXXXX, XXXXXXX, KC_PMNS, KC_P4, KC_P5,   KC_P6,   KC_P0, 
-        KC_PIPE, KC_AMPR, KC_EXLM, BRC,     KC_CIRC, XXXXXXX, XXXXXXX, KC_PAST, KC_P1, KC_P2,   KC_P3,   KC_COMM, 
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ENT,  LTR,   KC_BSPC, XXXXXXX, XXXXXXX
-    ),
-
-    /* Raise
-     * ,-----------------------------------------------------------------------------------.
-     * |Buttn4|Buttn3|RClick|LClick| Mute |      |      |Accel2| Home | PgDn | PgUp |  End |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |MouseL|MouseU|MouseD|MouseR| VolD |      |      |Accel1| Left | Down |  Up  | Right|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |WheelL|WheelD|WheelU|WheelR| VolU |      |      |Accel0|  RWD | Play |  FFD | Stop |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_RAISE] = LAYOUT_planck_grid(
-        KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_MUTE, XXXXXXX, XXXXXXX, KC_ACL2, KC_HOME, KC_PGDN, KC_PGUP, KC_END, 
-        KC_MS_L, KC_MS_U, KC_MS_D, KC_MS_R, KC_VOLD, XXXXXXX, XXXXXXX, KC_ACL1, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, 
-        KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_VOLU, XXXXXXX, XXXXXXX, KC_ACL0, KC_MRWD, KC_MPLY, KC_MFFD, KC_MSTP, 
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    /* Symbol
-     * ,-----------------------------------------------------------------------------------.
-     * |   !  |   @  |   #  |   $  |      |      |      |      |   +  |   {  |   }  |   '  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   %  |   ^  |   &  |   |  |      |      |      |      |   -  |   (  |   }  |   "  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |   =  |   `  |   \  |   ~  |      |      |      |      |   *  |   (  |   )  |   _  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_SYMBOL] = LAYOUT_planck_grid(
-        KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PLUS, KC_LCBR, KC_RCBR, KC_QUOT,
-        KC_PERC, KC_CIRC, KC_AMPR, KC_PIPE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_LPRN, KC_RPRN, KC_DQUO,
-        KC_EQL,  KC_GRV,  KC_BSLS, KC_TILD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ASTR, KC_LBRC, KC_RBRC, KC_UNDS,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    /* Function
-     * ,-----------------------------------------------------------------------------------.
-     * |  F1  |  F2  |  F3  |  F4  |PrtSc5|      |      |      |  F13 |  F14 |  F15 |  F16 |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F5  |  F6  |  F7  |  F8  |PrtSc4|      |      |      |  F17 |  F18 |  F19 |  F20 |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |  F9  |  F10 |  F11 |  F12 |PrtSc3|      |      |      |  F21 |  F22 |  F23 |  F24 |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_FUNCTION] = LAYOUT_planck_grid(
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   PRTSC5,  XXXXXXX, XXXXXXX, XXXXXXX, KC_F13,  KC_F14,  KC_F15,  KC_F16,
-        KC_F5,   KC_F6,   KC_F7,   KC_F8,   PRTSC4,  XXXXXXX, XXXXXXX, XXXXXXX, KC_F17,  KC_F18,  KC_F19,  KC_F20,
-        KC_F9,   KC_F10,  KC_F11,  KC_F12,  PRTSC3,  XXXXXXX, XXXXXXX, XXXXXXX, KC_F21,  KC_F22,  KC_F23,  KC_F24,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-
-    /* Adjust (Lower + Raise)
-     *                      v------------------------RGB CONTROL--------------------v
-     * ,-----------------------------------------------------------------------------------.
-     * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|      |Plover|      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
-     */
-    [_ADJUST] = LAYOUT_planck_grid(
-        XXXXXXX, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, XXXXXXX, 
-        XXXXXXX, XXXXXXX, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, XXXXXXX, PLOVER,   XXXXXXX, XXXXXXX, XXXXXXX, 
-        XXXXXXX, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, XXXXXXX, XXXXXXX, XXXXXXX, 
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX
-    )
-};
-
-#ifdef AUDIO_ENABLE
-    float plover_song[][2]     = SONG(PLOVER_SOUND);
-    float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    bool is_plover_on = layer_state_cmp(state, _PLOVER);
-    bool static was_plover_on = false, autoshift_on;
-    if (is_plover_on != was_plover_on) {
-        if (is_plover_on) {
-            autoshift_on = get_autoshift_state();
-            autoshift_disable();
-        } else {
-            if (autoshift_on) {
-                autoshift_enable();
-                autoshift_on = false;
-            }
-        }
-        was_plover_on = is_plover_on;
-     }
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case CBR:
-            if (record->event.pressed) {
-                SEND_STRING("{}" SS_TAP(X_LEFT));
-            }
-            return false;
-            break;
-        case PRN:
-            if (record->event.pressed) {
-                SEND_STRING("()" SS_TAP(X_LEFT));
-            }
-            return false;
-            break;
-        case BRC:
-            if (record->event.pressed) {
-                SEND_STRING("[]" SS_TAP(X_LEFT));
-            }
-            return false;
-            break;
-        case DQUO:
-            if (record->event.pressed) {
-                SEND_STRING("\"\"" SS_TAP(X_LEFT));
-            }
-            return false;
-            break;
-        case PRTSC3:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LCMD(SS_LSFT("3")));
-            }
-            return false;
-            break;
-        case PRTSC4:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LCMD(SS_LSFT("4")));
-            }
-            return false;
-            break;
-        case PRTSC5:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LCMD(SS_LSFT("5")));
-            }
-            return false;
-            break;
-        case PLOVER:
-            if (record->event.pressed) {
-                #ifdef AUDIO_ENABLE
-                    stop_all_notes();
-                    PLAY_SONG(plover_song);
-                #endif
-                layer_off(_RAISE);
-                layer_off(_LOWER);
-                layer_off(_ADJUST);
-                layer_on(_PLOVER);
-                if (!eeconfig_is_enabled()) {
-                    eeconfig_init();
-                }
-                keymap_config.raw  = eeconfig_read_keymap();
-                keymap_config.nkro = 1;
-                eeconfig_update_keymap(keymap_config.raw);
-            }
-            return false;
-            break;
-        case EXT_PLV:
-            if (record->event.pressed) {
-                #ifdef AUDIO_ENABLE
-                    PLAY_SONG(plover_gb_song);
-                #endif
-                    layer_off(_PLOVER);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
-bool muse_mode = false;
-uint8_t last_muse_note = 0;
-uint16_t muse_counter = 0;
-uint8_t muse_offset = 70;
-uint16_t muse_tempo = 50;
-
-void matrix_scan_user(void) {
-#ifdef AUDIO_ENABLE
-    if (muse_mode) {
-        if (muse_counter == 0) {
-            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
-            if (muse_note != last_muse_note) {
-                stop_note(compute_freq_for_midi_note(last_muse_note));
-                play_note(compute_freq_for_midi_note(muse_note), 0xF);
-                last_muse_note = muse_note;
-            }
-        }
-        muse_counter = (muse_counter + 1) % muse_tempo;
-    } else {
-        if (muse_counter) {
-            stop_all_notes();
-            muse_counter = 0;
-        }
-    }
-#endif
-}
-
-bool music_mask_user(uint16_t keycode) {
-    switch (keycode) {
-        case RAISE:
-        case LOWER:
-            return false;
-        default:
-            return true;
-    }
-}
--- a/keyboards/planck/keymaps/stuartfong1/readme.md
+++ b/keyboards/planck/keymaps/stuartfong1/readme.md
@@ -1,68 +0,0 @@
-# stuartfong1's Planck Layout
-
-I made this layout to improve ergonomics during daily usage, and to make access to symbols easier when writing code. The main idea is to make all keys easily accessible while reducing the risk of finger strain. 
-
-## Specifications
-This was made to work on a Planck rev. 6.1, and is used on macOS.
-
-## Base Layer
-
-![Image of Base Layer](https://i.imgur.com/XO7sgv4.png)
-
-This uses the Colemak DH layout with the wide mod.
-
- Colemak is an alternative to the QWERTY layout designed for efficient and ergonomic typing in the English language (https://colemak.com). The Colemak DH is a modification of Colemak that makes the D and H keys easier to reach. The wide mod shifts the halves of the keyboard apart, making it easier on the shoulders (https://colemakmods.github.io/mod-dh/).
- Space and backspace are located under the thumbs. Rotate the keys on the bottom row 180° for ease of use.
- I use Auto Shift. This allows me to hold a key to shift it, which prevents me from having to reach for the shift key. The time to activate auto shift can be changed in the config.h file.
- The 4 keys in the center are used for dynamic macros. On each side, hold the top key to start recording, and tap it to stop recording. Tap the middle key to play the macro. 2 macros can be stored at a time; the keys on the left are used for macro #1, and the keys on the right are used for macro #2.
- Modifiers are located at the bottom left and bottom right of the keyboard. They can be accessed by moving the thumbs or with the sides of your hands.
-
-## Numpad Layer
-
-![Image of Numpad Layer](https://i.imgur.com/dPzvYM6.png)
-
-This contains a numpad and some non-alphanumeric characters such as math symbols and quotes.
-
- The numpad is found under the right hand. It contains numbers and basic math symbols.
- Brackets are typed using the left index finger. These keys. as well as the quotation marks, are macros that type both the beginning and end bracket, and move the cursor inside them.
- The rest of the keys are those that are commonly used while writing code.
-
-## Navigation Layer
-
-![Image of Navigation Layer](https://i.imgur.com/Mr4EQbW.png)
-
-This contains mouse keys, arrow keys, and other keys used for navigation.
-
- The left side has all the basic functionality of a mouse. The keys on the home row are used to move the mouse, the top ones are used for clicking on something, and the keys on the bottom are used to move the scroll wheel. The speed of the mouse can be adjusted using the right index finger.
- The arrow keys are located on the right hand on the home row. Above these keys are some keys that are located on the navigation cluster.
- Media keys are located on the bottom right, and the volume can be adjusted by using the left index finger.
-
-## Symbol Layer
-
-![Image of Symbol Layer](https://i.imgur.com/1ny1x9H.png)
-
-This contains all the symbols that are not found on the other layers.
-
- The left side has most of the shifted number keys in increasing order. Some other keys here are for bitwise operators.
- The right side has symbols that are repeated in the numpad layer. Individual brackets are located here in case I accidentally press backspace on one.
-
-## Function Layer
-
-![Image of Function Layer](https://i.imgur.com/Sc3qUs3.png)
-
-This has all the function keys from F1 to F24.
-
- The function keys are sorted in increasing order.
- F14 and F15 are used to lower and increase the brightness respectively.
- Commands to screenshot / screen record are accessed with the left index finger.
-
-## Additional Layers
-
- Adjust: Some settings for RGB control, music mode, and to reset the keyboard.
-
-![Image of Adjust Layer](https://i.imgur.com/gjxXXqj.png)
-
- Plover: Used for stenography (http://www.openstenoproject.org). As I am still learning, I have included some extra keys.
-
-![Image of Plover Layer](https://i.imgur.com/uoSHgIC.png)
-
--- a/keyboards/planck/keymaps/stuartfong1/rules.mk
+++ b/keyboards/planck/keymaps/stuartfong1/rules.mk
@@ -1,4 +0,0 @@
-SRC += muse.c
-AUTO_SHIFT_ENABLE = yes
-DYNAMIC_MACRO_ENABLE = yes
-STENO_ENABLE = yes
--- a/keyboards/playkbtw/helen80/helen80.h
+++ b/keyboards/playkbtw/helen80/helen80.h
@@ -30,7 +30,7 @@
    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,          K1E   }, \
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4C   }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C                 }, \
    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E   }, \
 }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jack Humbert	d2123f3c07	remove some outdated changes	2021-02-08 14:48:56 -05:00
Jack Humbert	3996250d81	merge from master	2021-02-07 21:01:30 -05:00
Jack Humbert	09ff4b0c99	possibly all files needed to make things work	2021-02-07 19:53:50 -05:00
Jack Humbert	708bb4f55d	Merge branch 'hid_joystick' of git://github.com/a-chol/qmk_firmware into a-chol-hid_joystick	2020-05-04 13:19:48 -04:00
a-chol	a80ea8b7cc	Merge branch 'master' into hid_joystick	2020-03-30 14:41:56 +02:00
a-chol	a03d1eb66b	Add PR corrections	2020-03-30 14:38:57 +02:00
a-chol	92c6466089	Update docs/feature_joystick.md Co-Authored-By: Ryan <fauxpark@gmail.com>	2020-03-30 14:25:49 +02:00
a-chol	16fe12e6b6	Update docs/feature_joystick.md Co-Authored-By: Ryan <fauxpark@gmail.com>	2020-03-30 14:24:48 +02:00
a-chol	1d8102183f	Switch saveState and restoreState signature to use pin_t type. onekey:joystick : add a second axis, virtual and programmatically animated.	2020-03-30 14:11:44 +02:00
a-chol	476fce8a32	Add missing mcuconf.h and halconf.h to onekey:joystick keymap. Add suggested fixes from PR.	2020-03-30 11:19:23 +02:00
a-chol	0ce015d0c9	Update tmk_core/protocol/lufa/lufa.c Co-Authored-By: Ryan <fauxpark@gmail.com>	2020-03-30 11:17:26 +02:00
a-chol	c447c4ffd5	Update tmk_core/protocol/chibios/usb_main.c Co-Authored-By: Ryan <fauxpark@gmail.com>	2020-03-30 11:17:14 +02:00
a-chol	887e96cbb2	Fix HID joystick report sending for ChibiOS. Add one analog axis to the onekey:joystick keymap. Fix pin state save and restore during joystick analog read for STM32 MCUs.	2020-03-30 00:51:43 +02:00
a-chol	def06b4976	Add support for joystick adc reading for stm32 MCUs. Fix joystick hid report sending for chibios	2020-03-29 15:43:19 +02:00
a-chol	34bedc3787	Update tmk_core/protocol/usb_descriptor.c Co-Authored-By: Ryan <fauxpark@gmail.com>	2020-03-22 11:26:01 +01:00
a-chol	c6c01f9eff	Update tmk_core/protocol/usb_descriptor.c Co-Authored-By: Ryan <fauxpark@gmail.com>	2020-03-22 11:26:01 +01:00
a-chol	86853a4110	Update tmk_core/protocol/usb_descriptor.c Co-Authored-By: Ryan <fauxpark@gmail.com>	2020-03-22 11:26:01 +01:00
a-chol	a8a2825bd4	Update tmk_core/protocol/lufa/lufa.c Co-Authored-By: Ryan <fauxpark@gmail.com>	2020-03-22 11:26:01 +01:00
Nick Brassel	38cd264dd8	Remove V-USB support for now. Updated docs accordingly.	2020-03-22 11:25:55 +01:00
a-chol	6fd7f9d12f	avoid float functions to compute range mapping for axis adc reading	2020-03-22 11:24:43 +01:00
Nick Brassel	801be60473	The other required set of changes As per the PR, the changes still holding it up. Add onekey for testing. Fix ARM builds. Fix device descriptor when either axes or buttons is zero. Add compile-time check for at least one axis or button. Move definition to try to fix conflict. PR review comments. qmk cformat	2020-03-22 11:24:43 +01:00
a-chol	d88bdc6a1b	Fix port addressing for joystick analog read	2020-03-22 11:24:42 +01:00
achol	b030c45705	Add save and restore of each pin used in reading joystick (AVR). Allow output pin to be JS_VIRTUAL_AXIS if the axis is connected to Vcc instead of an output pin from the MCU. Fix joystick report id Fix broken v-usb hid joystick interface. Make it more resilient to unusual settings (none multiple of eight button count, 0 buttons or 0 axes) Correct adc reading for multiple axes. Piecewise range conversion for uncentered raw value range. Input, output and ground pin configuration per axis. Documentation fixes	2020-03-22 11:24:36 +01:00
José Júnior	ee43b338ea	Incorporates patches and changes to HID reporting There are some patches provided by @a-chol incorporated on this commit, and also some changes I made to the HID Report structure. The most interesting is the one dealing with number of buttons: Linux doesn't seem to care, but Windows requires the HID structure to be byte aligned (that's in the spec). So if one declares 8/16/32... buttons they should not have any issues, but this is what happens when you have 9 buttons: ``` bits \|0\|1\|2\|3\|4\|5\|6\|7\| \|\|\|\|\|\|\|\|\| axis 0 (report size 8) \|\|\|\|\|\|\|\|\| ... \|\|\|\|\|\|\|\|\| \|\|\|\|\|\|\|\|\| \|\|\|\|\|\|\|\|\| \|\|\|\|\|\|\|\|\| \|\|\|\|\|\|\|\|\| axis 6 \|\|\|\|\|\|\|\|\| first 8 buttons (report size 1) \|*\| \| \| \| \| \| \| \| last of 9 buttons, not aligned ``` So for that I added a conditonal that will add a number of reports with size 1 to make sure it aligns to the next multiple of 8. Those reports send dummy inputs that don't do anything aside from aligning the data. Tested on Linux, Windows 10 and Street Fighter (where the joystick is recognized as direct-input)	2020-03-22 11:23:32 +01:00
achol	3cf7611139	add support for hid gamepad interface add documentation for HID joystick Add joystick_task to read analog axes values even when no key is pressed or release. update doc Update docs/feature_joystick.md Manage pin setup and read to maintain matrix scan after analog read	2020-03-22 11:23:25 +01:00