Update tmk_core/common/wait.h

Co-Authored-By: Joel Challis <git@zvecr.com>
2019-10-23 13:35:39 -07:00 · 2019-10-22 23:57:09 -07:00 · 2019-10-22 23:57:04 -07:00 · 2019-10-22 23:20:00 -07:00
84 changed files with 439 additions and 1471 deletions
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -125,14 +125,14 @@ This command examines your environment and alerts you to potential build or flas
 qmk doctor
 ```

-## `qmk list-keyboards`
+## `qmk list_keyboards`

 This command lists all the keyboards currently defined in `qmk_firmware`

 **Usage**:

 ```
-qmk list-keyboards
+qmk list_keyboards
 ```

 ## `qmk new-keymap`
--- a/keyboards/1upkeyboards/1up60rgb/info.json
+++ b/keyboards/1upkeyboards/1up60rgb/info.json
@@ -14,7 +14,7 @@
    },

    "LAYOUT_60_iso": {
-      "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+      "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
    },

    "LAYOUT_60_ansi_split_bs_rshift": {
--- a/keyboards/1upkeyboards/sweet16/config.h
+++ b/keyboards/1upkeyboards/sweet16/config.h
@@ -4,6 +4,8 @@

 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x2010
+#define DEVICE_VER      0x0001
 #define MANUFACTURER    1up Keyboards
 #define PRODUCT         Sweet16
 #define DESCRIPTION     4x4 grid
@@ -12,11 +14,34 @@
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4

+/* key matrix pins */
+#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
+#define MATRIX_COL_PINS { D1, D0, D4, C6 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
 /* number of backlight levels */
-#define BACKLIGHT_LEVELS 10
+
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 3
+#endif
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5

 /* 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
+
+#define RGB_DI_PIN B1
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 1
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#endif
--- a/keyboards/1upkeyboards/sweet16/info.json
+++ b/keyboards/1upkeyboards/sweet16/info.json
@@ -1,7 +1,7 @@
 {
  "keyboard_name": "Sweet 16",
  "url": "",
-  "maintainer": "skullydazed",
+  "maintainer": "qmk",
  "width": 4,
  "height": 4,
  "layouts": {
--- a/keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c
@@ -25,15 +25,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    return true;
 }

-#ifdef ENCODER_ENABLE
-#include "encoder.h"
-void encoder_update_user(int8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder */
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  }
+void led_set_user(uint8_t usb_led) {
+
+  #ifndef CONVERT_TO_PROTON_C
+  /* Map RXLED to USB_LED_NUM_LOCK */
+	if (usb_led & (1 << USB_LED_NUM_LOCK)) {
+		DDRB |= (1 << 0); PORTB &= ~(1 << 0);
+	} else {
+		DDRB &= ~(1 << 0); PORTB &= ~(1 << 0);
+	}
+
+  /* Map TXLED to USB_LED_CAPS_LOCK */
+	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+		DDRD |= (1 << 5); PORTD &= ~(1 << 5);
+	} else {
+		DDRD &= ~(1 << 5); PORTD &= ~(1 << 5);
+	}
+  #endif
 }
-#endif
--- a/keyboards/1upkeyboards/sweet16/readme.md
+++ b/keyboards/1upkeyboards/sweet16/readme.md
@@ -1,12 +1,13 @@
 # Sweet 16 Macropad

-A 4x4 numpad/macro pad sold by 1up Keyboards.
+A 4x4 numpad/macro pad sold by 1up Keyboards - designed by Bishop Keyboards

-* Keyboard Maintainer: skullydazed
-* Hardware Supported: Sweet16 Keyboard PCB
-* Hardware Availability: [1up Keyboards](https://1upkeyboards.com/)
+Keyboard Maintainer: QMK Community  
+Hardware Supported: Sweet16 Keyboard PCB  
+Hardware Availability: [1up Keyboards](https://1upkeyboards.com/)

-Revisions:
-* [v1](./v1/)- The original macropad, designed by Bishop Keyboards
-* [v2/promicro](./v2/promicro)- The second macropad built with a Pro Micro, designed by Clueboard
-* [v2/proton_c](./v2/proton_c)- The second macropad built with a Proton C, designed by Clueboard
+Make example for this keyboard (after setting up your build environment):
+
+    make 1upkeyboards/sweet16: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/1upkeyboards/sweet16/rules.mk
+++ b/keyboards/1upkeyboards/sweet16/rules.mk
@@ -1,12 +1,27 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = caterina
+
 # Build Options
+#   comment out to disable the options.
 #
-DEFAULT_FOLDER = 1upkeyboards/sweet16/v1
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes  # Mouse keys
-EXTRAKEY_ENABLE = yes  # Audio control and System control
-CONSOLE_ENABLE = no    # Console for debug
+BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes  # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes  # Audio control and System control(+450)
+CONSOLE_ENABLE = no    # Console for debug(+400)
 COMMAND_ENABLE = no    # Commands for debug and configuration
 SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes      # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
 AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
+RGBLIGHT_ENABLE = yes
+EXTRAFLAGS += -flto
--- a/keyboards/1upkeyboards/sweet16/v1/config.h
+++ b/keyboards/1upkeyboards/sweet16/v1/config.h
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x2010
-#define DEVICE_VER      0x0001
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6 }
-#define UNUSED_PINS
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Underglow options */
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 1
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
--- a/keyboards/1upkeyboards/sweet16/v1/readme.md
+++ b/keyboards/1upkeyboards/sweet16/v1/readme.md
@@ -1,13 +0,0 @@
-# Sweet16 V1
-
-A 4x4 numpad/macro pad sold by 1up Keyboards - designed by Bishop Keyboards
-
-* Keyboard Maintainer: QMK Community
-* Hardware Supported: Sweet16 V1 PCB
-* Hardware Availability: [1up Keyboards](https://1upkeyboards.com/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make 1upkeyboards/sweet16/v1: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/1upkeyboards/sweet16/v1/rules.mk
+++ b/keyboards/1upkeyboards/sweet16/v1/rules.mk
@@ -1,5 +0,0 @@
-MCU = atmega32u4
-BOOTLOADER = caterina
-LINK_TIME_OPTIMIZATION_ENABLE=yes
-RGBLIGHT_ENABLE = yes
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
--- a/keyboards/1upkeyboards/sweet16/v1/v1.c
+++ b/keyboards/1upkeyboards/sweet16/v1/v1.c
@@ -1,21 +0,0 @@
-#include "v1.h"
-
-void led_set_kb(uint8_t usb_led) {
-#ifndef CONVERT_TO_PROTON_C
-    /* Map RXLED to USB_LED_NUM_LOCK */
-    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-        setPinOutput(B0);
-        writePinLow(B0);
-    } else {
-        setPinInput(B0);
-    }
-
-    /* Map TXLED to USB_LED_CAPS_LOCK */
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-        setPinOutput(D5);
-        writePinLow(D5);
-    } else {
-        setPinInput(D5);
-    }
-#endif
-}
--- a/keyboards/1upkeyboards/sweet16/v1/v1.h
+++ b/keyboards/1upkeyboards/sweet16/v1/v1.h
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Any changes to the layout names and/or definitions must also be made to info.json
-
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }  \
-}
-
-#define LAYOUT_numpad_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K23, \
-       K31,   K32      \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   KC_NO }, \
-    { K20,   K21,   K22,   K23 }, \
-    { KC_NO, K31,   K32,   KC_NO }  \
-}
-
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h
+++ b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h
@@ -1,31 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x2011
-#define DEVICE_VER      0x0001
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, D1, E6, B5 }
-#define MATRIX_COL_PINS { F7, F6, D2, D3 }
-#define UNUSED_PINS
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Encoder pins */
-#define ENCODERS_PAD_A { F4 }
-#define ENCODERS_PAD_B { F5 }
-#define ENCODER_RESOLUTION 4
-
-/* Underglow options */
-#define RGB_DI_PIN F4
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 1
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c
+++ b/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c
@@ -1,8 +0,0 @@
-#include "promicro.h"
-#include "encoder.h"
-
-#ifdef ENCODER_ENABLED
-void encoder_update_kb(int8_t index, bool clockwise) {
-    encoder_update_user(index, clockwise);
-}
-#endif
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h
+++ b/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Any changes to the layout names and/or definitions must also be made to info.json
-
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }  \
-}
-
-#define LAYOUT_numpad_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K23, \
-       K31,   K32      \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   KC_NO }, \
-    { K20,   K21,   K22,   K23 }, \
-    { KC_NO, K31,   K32,   KC_NO }  \
-}
-
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/readme.md
+++ b/keyboards/1upkeyboards/sweet16/v2/promicro/readme.md
@@ -1,13 +0,0 @@
-# Sweet16 V2 (Pro Micro)
-
-A 4x4 numpad/macro pad sold by 1up Keyboards - designed by Clueboard
-
-* Keyboard Maintainer: skullydazed
-* Hardware Supported: Sweet16 V2 PCB, Pro Micro
-* Hardware Availability: [1up Keyboards](https://1upkeyboards.com/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make 1upkeyboards/sweet16/v2/promicro: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/1upkeyboards/sweet16/v2/promicro/rules.mk
+++ b/keyboards/1upkeyboards/sweet16/v2/promicro/rules.mk
@@ -1,10 +0,0 @@
-MCU = atmega32u4
-BOOTLOADER = caterina
-LINK_TIME_OPTIMIZATION_ENABLE=yes
-
-## Features
-CONSOLE_ENABLE = yes
-
-## On a Pro Micro you have to choose between underglow and the rotary encoder.
-RGBLIGHT_ENABLE = no
-ENCODER_ENABLE = yes
--- a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
+++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x2011
-#define DEVICE_VER      0x0001
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B7, B2, B0 }
-#define MATRIX_COL_PINS { B8, A0, A10, A9 }
-#define UNUSED_PINS
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* Encoder pins */
-#define ENCODERS_PAD_A { A2 }
-#define ENCODERS_PAD_B { A1 }
-#define ENCODER_RESOLUTION 4
--- a/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c
+++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c
@@ -1 +0,0 @@
-#include "proton_c.h"
--- a/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h
+++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Any changes to the layout names and/or definitions must also be made to info.json
-
-#define LAYOUT_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }  \
-}
-
-#define LAYOUT_numpad_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K23, \
-       K31,   K32      \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   KC_NO }, \
-    { K20,   K21,   K22,   K23 }, \
-    { KC_NO, K31,   K32,   KC_NO }  \
-}
-
--- a/keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md
+++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md
@@ -1,13 +0,0 @@
-# Sweet16 V2 (Proton C)
-
-A 4x4 numpad/macro pad sold by 1up Keyboards - designed by Clueboard
-
-* Keyboard Maintainer: skullydazed
-* Hardware Supported: Sweet16 V2 PCB, Proton C
-* Hardware Availability: [1up Keyboards](https://1upkeyboards.com/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make 1upkeyboards/sweet16/v2/proton_c: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/1upkeyboards/sweet16/v2/proton_c/rules.mk
+++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/rules.mk
@@ -1,6 +0,0 @@
-MCU = STM32F303
-
-## Features
-CONSOLE_ENABLE = yes
-ENCODER_ENABLE = yes
-AUDIO_ENABLE = yes
--- a/keyboards/blackplum/blackplum.c
+++ b/keyboards/blackplum/blackplum.c
@@ -1 +0,0 @@
-#include "blackplum.h"
--- a/keyboards/blackplum/blackplum.h
+++ b/keyboards/blackplum/blackplum.h
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_68_ansi( \
-	K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66,  \
-    K80,      K81,      K82,      K83,      K84,      K85,      K86,	 K76, K67, K77\
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17 }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27 }, \
-	{ K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37 }, \
-	{ K40,   K41,   K42,   K43,   K44,   K45,   K46 }, \
-	{ K50,   K51,   K52,   K53,   K54,   K55 }, \
-	{ K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67 }, \
-	{ K70,   K71,   K72,   K73,   K74,	 K75,	K76,   K77 }, \
-	{ K80,   K81,   K82,   K83,   K84,	 K85,	K86 } \
-}
-
--- a/keyboards/blackplum/config.h
+++ b/keyboards/blackplum/config.h
@@ -1,39 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0xFADE
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Pixlup
-#define PRODUCT         Blackplum Keeb
-#define DESCRIPTION     Blackplum 68 Percent Mechanical Keyboard
-
-/* key matrix size */
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 8
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C6, B6, B4, B5, D6, D7, D5, D3, D4 }
-#define MATRIX_COL_PINS { D0, D1, D2, F7, F6, F5, F4, F1 }
-#define UNUSED_PINS
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* 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
-
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN C7
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 16    // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-#define RGBLIGHT_SLEEP
--- a/keyboards/blackplum/info.json
+++ b/keyboards/blackplum/info.json
@@ -1,12 +0,0 @@
-{
-    "keyboard_name": "blackplum",
-    "url": "www.tokopedia.com/pixlup",
-    "maintainer": "eriqadams",
-    "width": 17.25,
-    "height": 5.25,
-     "layouts": {
-        "LAYOUT_68_ansi": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Insert", "x":15.25, "y":0}, {"label":"PgUp", "x":16.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.25, "y":1}, {"label":"PgDn", "x":16.25, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"OS", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":12.5, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
-        }
-    }
-}
--- a/keyboards/blackplum/keymaps/default/keymap.c
+++ b/keyboards/blackplum/keymaps/default/keymap.c
@@ -1,43 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _BASE 0
-#define _FN 1
-
-
-
-enum custom_keycodes {
-  TG_GUI = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_68_ansi(
-    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_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_BSLS, 	KC_DEL,		KC_PGDOWN,\
-    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_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_LCTL , 	KC_LGUI , 	KC_LALT ,                      	KC_SPC ,											KC_RALT , 	MO(_FN) ,	KC_RCTL, 	KC_LEFT,	KC_DOWN,	KC_RIGHT
-  ),
-
-  [_FN] = LAYOUT_68_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_MPLY,	KC_HOME,\
-    _______, 	RGB_MOD, 	RGB_HUI,   	RGB_SAI, RGB_VAI, 	_______, _______, _______, 	_______, 	_______, 	KC_PSCR, 	KC_SLCK, 	KC_PAUSE,  	_______,	KC_MUTE,	KC_END,\
-    _______,	RGB_TOG, 	RGB_HUD, 	RGB_SAD, RGB_VAD, 	_______, _______, _______, 	_______, 	_______, 	_______, 	_______, 				_______,\
-    _______,	_______, 	_______, 	_______, _______, 	_______, _______, _______,	_______, 				_______, 	_______, 				_______,	KC_VOLU,\
-    _______, 	TG_GUI,_______, 						RESET, 												_______,	_______,	_______,	KC_MPRV,    KC_VOLD, 	KC_MNXT
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if(record->event.pressed) {
-        switch(keycode) {
-            case TG_GUI:
-                keymap_config.no_gui ^= 1;
-                return false;
-        }
-    }
-    return true;
-}
--- a/keyboards/blackplum/readme.md
+++ b/keyboards/blackplum/readme.md
@@ -1,14 +0,0 @@
-# Blackplum
-![Blackplum](https://i.imgur.com/EOUQk4J.png)
-
-Blackplum a.k.a IMKG68 (which IMKG stands for Indonesian Mechanical Keyboard Group) is an 68% mechanical keyboard with RGB Underglow come with new layout you have never seen before. Recently the pcb and kits only available for purchase in Indonesia.
-
-Keyboard Maintainer: [eriqadams](https://github.com/eriqadams)  
-Hardware Supported: Blackplum PCB, ATMEGA32u4-au MCU  
-Hardware Availability: [If you're in Indonesia you can purchase here](https://tokopedia.com/pixlup) 
-
-Make example for this keyboard (after setting up your build environment):
-
-    make blackplum: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/blackplum/rules.mk
+++ b/keyboards/blackplum/rules.mk
@@ -1,27 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-BOOTLOADER = qmk-dfu
-
-# Build Options
-#   comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = yes	# 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
-SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes				# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
-
-LAYOUTS = 68_ansi
--- a/keyboards/clueboard/california/california.c
+++ b/keyboards/clueboard/california/california.c
@@ -1 +0,0 @@
-#include "california.h"
--- a/keyboards/clueboard/california/california.h
+++ b/keyboards/clueboard/california/california.h
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Any changes to the layout names and/or definitions must also be made to info.json
-
-#define LAYOUT( \
-    K00, K01, \
-    K10, K11, \
-         K21, \
-    K30, K31, \
-    K40, K41, \
-         K51 \
-) { \
-    { K00, K01 }, \
-    { K10, K11 }, \
-    { KC_NO, K21 }, \
-    { K30, K31 }, \
-    { K40, K41 }, \
-    { KC_NO, K51 }  \
-}
--- a/keyboards/clueboard/california/config.h
+++ b/keyboards/clueboard/california/config.h
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xC1ED
-#define PRODUCT_ID      0x23B0
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Clueboard
-#define PRODUCT         California Macropad
-#define DESCRIPTION     A 10-key macropad shaped like California
-
-/* key matrix pins */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 2
-#define DIRECT_PINS { \
-    { A10, A9 }, \
-    { A0, B8 }, \
-    { NO_PIN, B11 }, \
-    { B9, A8 }, \
-    { A7, B1 }, \
-    { NO_PIN, B2 } \
-}
-#define UNUSED_PINS
--- a/keyboards/clueboard/california/info.json
+++ b/keyboards/clueboard/california/info.json
@@ -1,10 +0,0 @@
-{
-    "keyboard_name": "Clueboard California",
-    "url": "",
-    "maintainer": "skullydazed",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":1, "y":2}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":3.75, "y":5}]
-        }
-    }
-}
--- a/keyboards/clueboard/california/keymaps/default/keymap.json
+++ b/keyboards/clueboard/california/keymaps/default/keymap.json
@@ -1,7 +0,0 @@
-{
-    "keyboard":"clueboard/california",
-    "layout":"LAYOUT",
-    "layers":[
-        ["KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","BL_STEP"]
-    ]
-}
--- a/keyboards/clueboard/california/readme.md
+++ b/keyboards/clueboard/california/readme.md
@@ -1,13 +0,0 @@
-# Clueboard California
-
-A macropad shaped like California
-
-* Keyboard Maintainer: [Zach White](https://github.com/skullydazed)
-* Hardware Supported: Clueboard California PCB
-* Hardware Availability: 2019 Northern California Meetup
-
-Make example for this keyboard (after setting up your build environment):
-
-    make clueboard/california: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/clueboard/california/rules.mk
+++ b/keyboards/clueboard/california/rules.mk
@@ -1,10 +0,0 @@
-MCU = STM32F303
-
-## Features
-MOUSEKEY_ENABLE = yes  # Mouse keys
-EXTRAKEY_ENABLE = yes  # Audio control and System control
-CONSOLE_ENABLE = yes   # Console for debug
-COMMAND_ENABLE = no    # Commands for debug and configuration
-NKRO_ENABLE = yes      # USB Nkey Rollover
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = yes
--- a/keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c
@@ -1,18 +1,22 @@
 // Nordic layout for Ergodox infinity
+
 #include QMK_KEYBOARD_H
+#include "debug.h"
+#include "action_layer.h"
 #include "version.h"
 #include "keymap_nordic.h"
 #include "keymap_german.h"

-enum layer_names {
-    BASE,
-    FUNCL,
-    SYMB,
-    MDIA
-};
+// Layer names
+#define BASE 0 // default layer
+#define FUNCL 1 // function layer
+#define SYMB 2 // symbol layer
+#define MDIA 3 // media keys

 enum custom_keycodes {
-    VRSN = SAFE_RANGE,
+    PLACEHOLDER = SAFE_RANGE, // can always be here
+    EPRM,
+    VRSN,
    RGB_SLD
 };

@@ -30,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |--------+------+------+------+------+------|  L2  |           |  L2  |------+------+------+------+------+--------|
 * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |  -   | RShift |
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Ctrl |  ¨^  |  <|>  | LGui | Alt  |                                       | Ctrl |  Alt  |  ´`  |   +  | RGui |
+ *   | Ctrl |  ¨^  |  <|>  | Alt | LGui|                                       | Ctrl |  Alt  |  ´`  |   +  | RGui |
 *   `----------------------------------'                                       `----------------------------------'
 *                                        ,-------------.       ,-------------.
 *                                        | LEFT |RIGHT |       | DOWN | UP   |
@@ -42,69 +46,69 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */

 [BASE] = LAYOUT_ergodox(  // layer 0 : default
-    // left hand
-    KC_ESC,   KC_1,   KC_2,   KC_3,   KC_4,  KC_5,   KC_GRV,
-    KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,  KC_T,   TG(1),
-    KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,  KC_G,
-    KC_LSFT,  KC_Z,   KC_X,   KC_C,   KC_V,  KC_B,   MO(2),
-    KC_LCTRL, MO(3),  KC_EQL, KC_LGUI, KC_LALT,
-                                            KC_NLCK,  KC_SLCK,
-                                            KC_HOME,
-                                            KC_SPC,   KC_DEL, KC_END,
+        // left hand
+        KC_ESC,    KC_1,  KC_2,  KC_3,  KC_4,  KC_5,   KC_GRV,
+        KC_TAB,    KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,   TG(1),
+        KC_CAPS,   KC_A,  KC_S,  KC_D,  KC_F,  KC_G,
+        KC_LSFT,   KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,   MO(2),
+        KC_LCTRL,  KC_RBRC, KC_NONUS_BSLASH,  KC_LALT,  KC_LGUI,
+                                               KC_LEFT, KC_RIGHT,
+                                                              KC_HOME,
+                                               KC_SPC,KC_DEL, KC_END,
+        // right hand
+        KC_PSCREEN,  KC_6,   KC_7,    KC_8,    KC_9,   KC_0,        KC_MINS,
+        TG(1),   KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,        KC_LBRC,
+                     KC_H,   KC_J,    KC_K,    KC_L,   KC_SCLN,     KC_QUOT,
+        MO(2),    KC_N,   KC_M,    KC_COMM, KC_DOT, KC_SLSH,     KC_RSFT,
+                             KC_RCTRL, KC_RALT,   KC_BSLS,  KC_EQL, KC_RGUI,
+        KC_DOWN, KC_UP,
+        KC_PGUP,
+        KC_PGDN, KC_ENT, KC_BSPC
+    ),

-    // right hand
-    KC_BSLS,  KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,
-    TG(1),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,
-              KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
-    MO(2),    KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_NONUS_BSLASH,
-    KC_LEFT,  KC_DOWN, KC_UP, KC_RIGHT, KC_RBRC,
-    KC_RGUI,  KC_RALT,
-    KC_PGUP,
-    KC_PGDN,  KC_ENT, KC_BSPC
-),
 /* Keymap 1: Basic layer with functions
 *
 *
 *
 * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |  F11 |           | F12  |  F6  |  F7  |  F8  |  F9  |   0  |        |
+ * |  Esc   |  F1  |  F2  |  F3  |  F4  |  F5  |  F11 |           | F12 |  F6  |  F7  |  F8  |  F9  |   0  |   -    |
 * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |  Tab   |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  |   Å    |
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |  Caps  |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   Ö  |   Ä    |
+ * |--------+------+------+------+------+------|  L2  |           |  L2  |------+------+------+------+------+--------|
+ * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |  -   | RShift |
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |  ¨   |       |     |       |                                       |      |       |      |      |      |
+ *   | Ctrl |  ¨^  |  <|>  | Alt | LGui|                                       | Ctrl |  Alt  |  ´`  |   +  | RGui |
 *   `----------------------------------'                                       `----------------------------------'
 *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
+ *                                        | LEFT |RIGHT |       | DOWN | UP   |
 *                                 ,------+------+------|       |------+--------+------.
- *                                 |      |      |      |       |      |        |      |
- *                                 |      |      |------|       |------|        |      |
- *                                 |      |      |      |       |      |        |      |
+ *                                 |      |      | Home |       | PgUp |        |      |
+ *                                 | Space|Del   |------|       |------|  Enter | Bkspc|
+ *                                 |      |      | End  |       | PgDn |        |      |
 *                                 `--------------------'       `----------------------'
 */

 [FUNCL] = LAYOUT_ergodox(  // layer 1 : functions
-    // left hand
-    _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,
-                                            _______,  _______,
-                                            _______,
-                                            _______,  _______,  _______,
-    // right hand
-    KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,
-    _______,  _______,
-    _______,
-    _______,  _______,  _______
+  // left hand
+  _______,  KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F11,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,
+                                         _______, _______,
+                                                        _______,
+                                         _______,_______,_______,
+  // right hand
+  KC_F12,  KC_F6,   KC_F7,    KC_F8,    KC_F9,   KC_F10,     _______,
+  _______,    _______,  _______,  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,  _______,  _______,
+  _______,    _______,  _______,  _______,  _______,  _______,  _______,
+                      _______,  _______,  _______,  _______,  _______,
+  _______, _______,
+  _______,
+  _______, _______, _______
 ),

 /* Keymap 2: Symbol Layer
@@ -130,24 +134,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 // SYMBOLS
 [SYMB] = LAYOUT_ergodox(
-   // left hand
-   _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,
-   _______,  DE_EXLM,  DE_AT,    DE_LCBR,  DE_RCBR,  DE_PIPE,  _______,
-   _______,  DE_HASH,  DE_DLR,   DE_LPRN,  DE_RPRN,  DE_GRV,
-   _______,  DE_PERC,  DE_CIRC,  DE_LBRC,  DE_RBRC,  DE_TILD,  _______,
-   _______,  _______,  _______,  _______,  _______,
-                                           RGB_MOD,  BL_TOGG,
-                                           BL_INC,
-                                           RGB_VAD,  RGB_VAI,  BL_DEC,
-   // right hand
-   KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,
-   _______,  KC_UP,    KC_7,     KC_8,     KC_9,     DE_ASTR,  _______,
-             KC_DOWN,  KC_4,     KC_5,     KC_6,     DE_PLUS,  _______,
-   _______,  DE_AMPR,  KC_1,     KC_2,     KC_3,     DE_BSLS,  _______,
-   _______,  KC_DOT,   KC_0,     DE_EQL,   _______,
-   RGB_TOG,  RGB_SLD,
-   _______,
-   _______,  RGB_HUD,  RGB_HUI
+       // left hand
+       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
+       KC_TRNS,DE_EXLM,DE_AT,  DE_LCBR,DE_RCBR,DE_PIPE,KC_TRNS,
+       KC_TRNS,DE_HASH,DE_DLR, DE_LPRN,DE_RPRN,DE_GRV,
+       KC_TRNS,DE_PERC,DE_CIRC,DE_LBRC,DE_RBRC,DE_TILD,KC_TRNS,
+       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+                                       RGB_MOD,BL_TOGG,
+                                               BL_INC,
+                               RGB_VAD,RGB_VAI,BL_DEC,
+       // right hand
+       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
+       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    DE_ASTR, KC_F12,
+                KC_DOWN, KC_4,   KC_5,    KC_6,    DE_PLUS, KC_TRNS,
+       KC_TRNS, DE_AMPR, KC_1,   KC_2,    KC_3,    DE_BSLS, KC_TRNS,
+                         KC_TRNS,KC_DOT,  KC_0,    DE_EQL,  KC_TRNS,
+       RGB_TOG, RGB_SLD,
+       KC_TRNS,
+       KC_TRNS, RGB_HUD, RGB_HUI
 ),

 /* Keymap 3: Media and mouse keys
@@ -171,75 +175,82 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                 |      |      |      |       |      |      |      |
 *                                 `--------------------'       `--------------------'
 */
-
 // MEDIA AND MOUSE
 [MDIA] = LAYOUT_ergodox(
-   RESET,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,
-   _______,  _______,  KC_BTN1,  KC_MS_U,  KC_BTN2,  _______,  _______,
-   _______,  KC_BTN4,  KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_BTN5,
-   _______,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN3,  _______,
-   _______,  _______,  KC_ACL0,  KC_ACL1,  KC_ACL2,
-                                           _______,  _______,
-                                           _______,
-                                           KC_BTN1,  KC_BTN2,  _______,
-   // right hand
-   KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,
-   _______, _______,   KC_VOLD,  KC_MUTE,  KC_VOLU,  _______,  _______,
-            _______,   KC_MPRV,  KC_MSTP,  KC_MPLY,  KC_MNXT,  _______,
-   _______, KC_WSCH,   KC_WBAK,  KC_WHOM,  KC_WREF,  KC_WFWD,  _______,
-   _______, _______,   _______,  _______,  _______,
-   _______, _______,
-   _______,
-   _______, KC_WBAK, KC_WFWD
+       RESET, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5,
+       KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_BTN3, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_ACL0, KC_ACL1, KC_ACL2,
+                                           KC_TRNS, KC_TRNS,
+                                                    KC_TRNS,
+                                  KC_BTN1, KC_BTN2, KC_TRNS,
+    // right hand
+       KC_TRNS, KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11,
+       KC_TRNS, KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_F12,
+                KC_TRNS, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, KC_TRNS,
+       KC_TRNS, KC_WSCH, KC_WBAK, KC_WHOM, KC_WREF, KC_WFWD, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS,
+       KC_TRNS,
+       KC_TRNS, KC_WBAK, KC_WFWD
 ),
 };

-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-    // MACRODOWN only works in this function
-    switch (id) {
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  // MACRODOWN only works in this function
+      switch(id) {
        case 0:
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-            }
-            break;
+        if (record->event.pressed) {
+          SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+        }
+        break;
        case 1:
-            if (record->event.pressed) {  // For resetting EEPROM
-                eeconfig_init();
-            }
-            break;
-    }
+        if (record->event.pressed) { // For resetting EEPROM
+          eeconfig_init();
+        }
+        break;
+      }
    return MACRO_NONE;
 };

 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case VRSN:
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-            }
-            return false;
-            break;
-        case RGB_SLD:
-            if (record->event.pressed) {
-#ifdef RGBLIGHT_ENABLE
-                rgblight_mode(1);
-#endif
-            }
-            return false;
-            break;
-    }
-    return true;
+  switch (keycode) {
+    // dynamically generate these.
+    case EPRM:
+      if (record->event.pressed) {
+        eeconfig_init();
+      }
+      return false;
+      break;
+    case VRSN:
+      if (record->event.pressed) {
+        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+      }
+      return false;
+      break;
+    case RGB_SLD:
+      if (record->event.pressed) {
+        #ifdef RGBLIGHT_ENABLE
+          rgblight_mode(1);
+        #endif
+      }
+      return false;
+      break;
+  }
+  return true;
 }

 // Runs just one time when the keyboard initializes.
-void matrix_init_user(void){
+void matrix_init_user(void) {

 };

 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);

+    uint8_t layer = biton32(layer_state);
    ergodox_board_led_off();
    ergodox_right_led_1_off();
    ergodox_right_led_2_off();
@@ -251,10 +262,8 @@ void matrix_scan_user(void) {
        case 2:
            ergodox_right_led_2_on();
            break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
        default:
+            // none
            break;
    }
 };
--- a/keyboards/handwired/hnah40rgb/config.h
+++ b/keyboards/handwired/hnah40rgb/config.h
@@ -1,68 +0,0 @@
-/*
-Copyright 2019 HnahKB
-
-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 0xFEED
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER HnahKB
-#define PRODUCT Hnah40V2
-#define DESCRIPTION A custom rgb keyboard 
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
-
-/*
- * 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 \
-    { B7, D7, F1, F0 }
-#define MATRIX_COL_PINS \
-    { D5, D6, D3, D2, B6, C6, C7, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-
-// #define BACKLIGHT_PIN B7
-// #define BACKLIGHT_BREATHING
-// #define BACKLIGHT_LEVELS 3
-
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN E2
-#define DRIVER_LED_TOTAL 50
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
-#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
-#endif
--- a/keyboards/handwired/hnah40rgb/hnah40rgb.c
+++ b/keyboards/handwired/hnah40rgb/hnah40rgb.c
@@ -1,47 +0,0 @@
-#include "hnah40rgb.h"
-#ifdef RGB_MATRIX_ENABLE
-#if defined (ansi)
-led_config_t g_led_config = { {
-  //Key Matrix to LED Index
-  {0,         1,         2,           3,          4,          5,          6,          7,          8,          9,          10},
-  {22,        21,        20,          19,         18,         17,         16,         15,         14,         13,         12 },
-  {23,        24,        25,          26,         27,         28,         29,         30,         31,         NO_LED,     34},
-  {43,        42,        41,          NO_LED,     NO_LED,     NO_LED,     38,         NO_LED,     36,         35,         11}
-}, {
-  //LED Index to Physical Positon
-  {  0,  0},  { 20,  0},  { 40, 0 },  { 61, 0 },  { 81, 0},   { 101, 0},  { 122, 0},  { 142, 0},  { 162, 0},  { 183, 0},  { 224, 0}, { 224, 0},  
-  {224, 21},  {183, 21},  {162,21 },  {142, 21},  {122,21},   { 101,21},  { 81 ,21},  { 61 ,21},  { 40 ,21},  { 20 ,21},  { 0  ,21}, 
-  {  0, 42},  { 20, 42},  { 40,42 },  { 61, 42},  { 81,42},   { 101,42},  { 122,42},  { 142,42},  { 162,42},  { 183,42},  { 224,42}, 
-  {224, 64},  {224, 64},  {181,64 },  {162, 64},  {122,64},   {101,64},    { 61,64},   { 40,64},   { 20,64},   { 0,64}, 
-  { 0,64},    { 0,0},     { 224,10},   { 224,18},  { 224,30},  { 224,47},     
-}, {
-  1,          4,         4,          4,         4,         4,          4,          4,          4,          4,          1,   
-  1,          4,         4,          4,         4,         4,          4,          4,          4,          4,          1,
-  1,          4,         4,          4,         4,         4,          4,          4,          4,          4,          1,
-  1,          1,         1,          1,         1,         1,          1,          1,          1,          1,          1,
-  1,          1,         1,          1,         1,         1,                 
-} };
-
-#else
-led_config_t g_led_config = { {
-  //Key Matrix to LED Index
-  {0,         1,         2,           3,          4,          5,          6,          7,          8,          9,          10},
-  {22,        21,        20,          19,         18,         17,         16,         15,         14,         13,         12 },
-  {23,        24,        25,          26,         27,         28,         29,         30,         31,         32,         34},
-  {43,        42,        41,          NO_LED,     40,         39,         38,         37,         36,         35,         11}
-}, {
-  //LED Index to Physical Positon
-  {  0,  0},  { 20,  0},  { 40, 0 },  { 61, 0 },  { 81, 0},   { 101, 0},  { 122, 0},  { 142, 0},  { 162, 0},  { 183, 0},  { 224, 0}, { 224, 0},  
-  {224, 21},  {183, 21},  {162,21 },  {142, 21},  {122,21},   { 101,21},  { 81 ,21},  { 61 ,21},  { 40 ,21},  { 20 ,21},  { 0  ,21}, 
-  {  0, 42},  { 20, 42},  { 40,42 },  { 61, 42},  { 81,42},   { 101,42},  { 122,42},  { 142,42},  { 162,42},  { 183,42},  { 224,42}, 
-  {224, 64},  {224, 64},  {181,64 },  {162, 64},  {122,64},   {101,64},    { 61,64},   { 40,64},   { 20,64},   { 0,64}, 
-  { 0,64},    { 0,0},     { 224,10},   { 224,18},  { 224,30},  { 224,47},     
-}, {
-  1,          4,         4,          4,         4,         4,          4,          4,          4,          4,          4,   
-  1,          1,         4,          4,         4,         4,          4,          4,          4,          4,          4,
-  1,          1,         4,          4,         4,         4,          4,          4,          4,          4,          4,
-  1,          1,         1,          1,         1,         1,          1,          1,          1,          1,          1,
-  1,          1,         1,          1,         1,         1,                 
-} };
-#endif 
-#endif
--- a/keyboards/handwired/hnah40rgb/hnah40rgb.h
+++ b/keyboards/handwired/hnah40rgb/hnah40rgb.h
@@ -1,44 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * 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_all( \
-k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k41, \
-k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, \
-k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33,\
-k34, k35, k36, k37, k38, k39, k40 \
-) \
-{ \
-    {k00, k01, k02, k03,  k04, k05,   k06, k07, k08, k09, k10}, \
-    {k11, k12, k13, k14,  k15, k16,   k17, k18, k19, k20, k21}, \
-    {k22, k23, k24, k25,  k26, k27,   k28, k29, k30, k31, k32}, \
-    {k33, k34, k35, KC_NO,k36, KC_NO, k37, k38, k39, k40, k41}, \
-}
-
-#define LAYOUT_ansi( \
-k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k41, \
-k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, \
-k22, k23, k24, k25, k26, k27, k28, k29, k30, k32,\
-k33, k34, k35, k38, k39, k40 \
-) \
-{ \
-    {k00,   k01, k02, k03,   k04,   k05,   k06,   k07,   k08, k09,   k10}, \
-    {k11,   k12, k13, k14,   k15,   k16,   k17,   k18,   k19, k20,   k21}, \
-    {k22,   k23, k24, k25,   k26,   k27,   k28,   k29,   k30, KC_NO, k32}, \
-    {k33,   k34, k35, KC_NO, KC_NO, KC_NO, k38,   KC_NO, k39, k40,   k41}, \
-}
--- a/keyboards/handwired/hnah40rgb/info.json
+++ b/keyboards/handwired/hnah40rgb/info.json
@@ -1,100 +0,0 @@
-{
-    "keyboard_name": "Hnah40", 
-    "url": "",
-    "maintainer": "HnahKB", 
-    "width": 12, 
-    "height": 4, 
-    "layouts": {
-        "LAYOUT_all": {
-            "key_count": 42,
-            "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"Q", "x":1, "y":0}, 
-                {"label":"W", "x":2, "y":0}, 
-                {"label":"E", "x":3, "y":0}, 
-                {"label":"R", "x":4, "y":0}, 
-                {"label":"T", "x":5, "y":0}, 
-                {"label":"Y", "x":6, "y":0}, 
-                {"label":"U", "x":7, "y":0}, 
-                {"label":"I", "x":8, "y":0}, 
-                {"label":"O", "x":9, "y":0}, 
-                {"label":"P", "x":10, "y":0}, 
-                {"label":"BSPC", "x":11, "y":0}, 
-                {"label":"Caps Lock", "x":0, "y":1, "w":1.5}, 
-                {"label":"A", "x":1.5, "y":1}, 
-                {"label":"S", "x":2.5, "y":1}, 
-                {"label":"D", "x":3.5, "y":1}, 
-                {"label":"F", "x":4.5, "y":1}, 
-                {"label":"G", "x":5.5, "y":1}, 
-                {"label":"H", "x":6.5, "y":1}, 
-                {"label":"J", "x":7.5, "y":1}, 
-                {"label":"K", "x":8.5, "y":1}, 
-                {"label":"L", "x":9.5, "y":1}, 
-                {"label":"Enter", "x":10.5, "y":1, "w":1.5}, 
-                {"label":"Shift", "x":0, "y":2, "w":1.75}, 
-                {"label":"Z", "x":1.75, "y":2}, 
-                {"label":"X", "x":2.75, "y":2}, 
-                {"label":"C", "x":3.75, "y":2}, 
-                {"label":"V", "x":4.75, "y":2}, 
-                {"label":"B", "x":5.75, "y":2}, 
-                {"label":"N", "x":6.75, "y":2}, 
-                {"label":"M", "x":7.75, "y":2}, 
-                {"label":",", "x":8.75, "y":2}, 
-                {"label":".", "x":9.75, "y":2}, 
-                {"label":"Shift", "x":10.75, "y":2, "w":1.25}, 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":3, "w":1}, 
-                {"label":"Alt", "x":2.25, "y":3, "w":1.25}, 
-                {"label":"Space", "x":3.5, "y":3, "w":2.25}, 
-                {"label":"Space", "x":5.75, "y":3, "w":2.75},
-                {"label":"App", "x":8.5, "y":3, "w":1.25}, 
-                {"label":"Fn", "x":9.75, "y":3, "w":1}, 
-                {"label":"Ctrl", "x":10.75, "y":3, "w":1.25}
-            ]
-        },
-        "LAYOUT_ansi": {
-            "key_count": 39,
-            "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"Q", "x":1, "y":0}, 
-                {"label":"W", "x":2, "y":0}, 
-                {"label":"E", "x":3, "y":0}, 
-                {"label":"R", "x":4, "y":0}, 
-                {"label":"T", "x":5, "y":0}, 
-                {"label":"Y", "x":6, "y":0}, 
-                {"label":"U", "x":7, "y":0}, 
-                {"label":"I", "x":8, "y":0}, 
-                {"label":"O", "x":9, "y":0}, 
-                {"label":"P", "x":10, "y":0}, 
-                {"label":"BSPC", "x":11, "y":0}, 
-                {"label":"Caps Lock", "x":0, "y":1, "w":1.5}, 
-                {"label":"A", "x":1.5, "y":1}, 
-                {"label":"S", "x":2.5, "y":1}, 
-                {"label":"D", "x":3.5, "y":1}, 
-                {"label":"F", "x":4.5, "y":1}, 
-                {"label":"G", "x":5.5, "y":1}, 
-                {"label":"H", "x":6.5, "y":1}, 
-                {"label":"J", "x":7.5, "y":1}, 
-                {"label":"K", "x":8.5, "y":1}, 
-                {"label":"L", "x":9.5, "y":1}, 
-                {"label":"Enter", "x":10.5, "y":1, "w":1.5}, 
-                {"label":"Shift", "x":0, "y":2, "w":1.75}, 
-                {"label":"Z", "x":1.75, "y":2}, 
-                {"label":"X", "x":2.75, "y":2}, 
-                {"label":"C", "x":3.75, "y":2}, 
-                {"label":"V", "x":4.75, "y":2}, 
-                {"label":"B", "x":5.75, "y":2}, 
-                {"label":"N", "x":6.75, "y":2}, 
-                {"label":"M", "x":7.75, "y":2}, 
-                {"label":",", "x":8.75, "y":2}, 
-                {"label":"Shift", "x":9.75, "y":2, "w":2.25}, 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":3}, 
-                {"label":"Alt", "x":2.25, "y":3, "w":1.25}, 
-                {"label":"Space", "x":3.5, "y":3, "w":6}, 
-                {"label":"App", "x":9.5, "y":3, "w":1.25}, 
-                {"label":"Ctrl", "x":10.75, "y":3, "w":1.25}
-            ]
-        }
-    }
-}
--- a/keyboards/handwired/hnah40rgb/keymaps/ansi/config.h
+++ b/keyboards/handwired/hnah40rgb/keymaps/ansi/config.h
@@ -1,18 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * 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 ansi
--- a/keyboards/handwired/hnah40rgb/keymaps/ansi/keymap.c
+++ b/keyboards/handwired/hnah40rgb/keymaps/ansi/keymap.c
@@ -1,67 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * 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
-
-enum hnah_layers{
-    _BASE,
-    _L1,
-    _L2
-};
-
-enum hnah_keycodes{
-    BASE,
-    L1,
-    L2
-};
-
-#define L1 MO(_L1)
-#define L2 MO(_L2)
-
-// Defines the keycodes used by our macros in process_record_user
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_ansi(/* Base */
-                 KC_ESC,          KC_Q,     KC_W,      KC_E,      KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,   KC_BSPC,
-                 LT(_L2,KC_CAPS), KC_A,     KC_S,      KC_D,      KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_ENT,
-                 KC_LSFT,         KC_Z,     KC_X,      KC_C,      KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,            KC_RSFT,
-                 KC_LCTL,         KC_LGUI,  KC_LALT,                        KC_SPACE,                               L1,     KC_RCTL ),
-    [_L1] = LAYOUT_ansi(/* Base */
-                 RESET,           KC_1,     KC_2,      KC_3,      KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,    KC_DEL,
-                 KC_TRNS,         KC_F1,    KC_F2,     KC_F3,     KC_F4,    KC_F5,    KC_F6,    KC_MINS,  KC_EQL,   KC_SCLN,  KC_QUOT,
-                 KC_TRNS,         KC_F7,    KC_F8,     KC_F9,     KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_TRNS,            KC_TRNS,
-                 KC_TRNS,         KC_TRNS,  KC_TRNS,                        KC_TRNS,                                KC_TRNS, KC_TRNS ),
-    [_L2] = LAYOUT_ansi(/* Base */
-                 RGB_TOG,         RGB_RMOD, KC_UP,     RGB_MOD,   RGB_HUI,  RGB_VAI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
-                 KC_TRNS,         KC_LEFT,  KC_DOWN,   KC_RGHT,   RGB_HUD,  RGB_VAD,  RGB_SAD,  RGB_SPD,  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_TAB,                                 KC_TRNS, KC_TRNS ),
-};
-
-void rgb_matrix_indicators_user(void)
-{
-        if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
-        {
-            rgb_matrix_set_color(22, 255, 255, 255);
-        }
-        if (IS_LAYER_ON(_L1))
-        {
-            rgb_matrix_set_color(46, 255, 255, 255);
-        }
-        if (IS_LAYER_ON(_L2))
-        {
-            rgb_matrix_set_color(45, 255, 255, 255);
-        }
-}
--- a/keyboards/handwired/hnah40rgb/keymaps/ansi/readme.md
+++ b/keyboards/handwired/hnah40rgb/keymaps/ansi/readme.md
@@ -1 +0,0 @@
-# The ansi keymap for hnah40rgb
--- a/keyboards/handwired/hnah40rgb/keymaps/default/config.h
+++ b/keyboards/handwired/hnah40rgb/keymaps/default/config.h
@@ -1,17 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * 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
--- a/keyboards/handwired/hnah40rgb/keymaps/default/keymap.c
+++ b/keyboards/handwired/hnah40rgb/keymaps/default/keymap.c
@@ -1,67 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * 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
-
-enum hnah_layers{
-    _BASE,
-    _L1,
-    _L2
-};
-
-enum hnah_keycodes{
-    BASE,
-    L1,
-    L2
-};
-
-#define L1 MO(_L1)
-#define L2 MO(_L2)
-
-// Defines the keycodes used by our macros in process_record_user
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_all(/* Base */
-                 KC_ESC,          KC_Q,     KC_W,      KC_E,      KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,   KC_BSPC,
-                 LT(_L2,KC_CAPS), KC_A,     KC_S,      KC_D,      KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_ENT,
-                 KC_LSFT,         KC_Z,     KC_X,      KC_C,      KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_RSFT,
-                 KC_LCTL,         KC_LGUI,  KC_LALT,   KC_SPACE,            KC_SPACE, KC_RALT,  L1,  KC_RCTL ),
-    [_L1] = LAYOUT_all(/* Base */
-                 RESET,           KC_1,     KC_2,      KC_3,      KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,    KC_DEL,
-                 KC_TRNS,         KC_F1,    KC_F2,     KC_F3,     KC_F4,    KC_F5,    KC_F6,    KC_MINS,  KC_EQL,   KC_SCLN,  KC_QUOT,
-                 KC_TRNS,         KC_F7,    KC_F8,     KC_F9,     KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_TRNS,  KC_SLSH,  KC_TRNS,
-                 KC_TRNS,         KC_TRNS,  KC_TRNS,   KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS ),
-    [_L2] = LAYOUT_all(/* Base */
-                 RGB_TOG,         RGB_RMOD, KC_UP,     RGB_MOD,   RGB_HUI,  RGB_VAI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,
-                 KC_TRNS,         KC_LEFT,  KC_DOWN,   KC_RGHT,   RGB_HUD,  RGB_VAD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_BSLS,
-                 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_TAB,              KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS ),
-};
-
-void rgb_matrix_indicators_user(void)
-{
-        if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
-        {
-            rgb_matrix_set_color(22, 255, 255, 255);
-        }
-        if (IS_LAYER_ON(_L1))
-        {
-            rgb_matrix_set_color(46, 255, 255, 255);
-        }
-        if (IS_LAYER_ON(_L2))
-        {
-            rgb_matrix_set_color(45, 255, 255, 255);
-        }
-}
--- a/keyboards/handwired/hnah40rgb/keymaps/default/readme.md
+++ b/keyboards/handwired/hnah40rgb/keymaps/default/readme.md
@@ -1 +0,0 @@
-# The default keymap for hnah40rgb
--- a/keyboards/handwired/hnah40rgb/readme.md
+++ b/keyboards/handwired/hnah40rgb/readme.md
@@ -1,14 +0,0 @@
-# hnah40rgb
-
-![hnah40rgb](https://i.imgur.com/wmqx6oL.jpg)
-
-A 40 percent keyboard Hnah40v2 rgb version
-
-Keyboard Maintainer: [HnahKB](https://github.com/vuhopkep)  
-Hardware Availability: Hnah40V2 RGB
-
-Make example for this keyboard (after setting up your build environment):
-
-    make handwired/hnah40rgb: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/handwired/hnah40rgb/rules.mk
+++ b/keyboards/handwired/hnah40rgb/rules.mk
@@ -1,33 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   atmega32A    bootloadHID
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # 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 = no            # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
-RGB_MATRIX_ENABLE = WS2812
--- a/keyboards/naked48/keymaps/default/config.h
+++ b/keyboards/naked48/keymaps/default/config.h
@@ -26,3 +26,5 @@

 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180
+
+#define RGBLED_NUM 48    // Number of LEDs
--- a/keyboards/naked48/keymaps/default/keymap.c
+++ b/keyboards/naked48/keymaps/default/keymap.c
@@ -24,6 +24,10 @@ enum custom_keycodes {
  RGB_RST = SAFE_RANGE
 };

+// Layer Mode aliases
+#define KC_SNUBS S(KC_NUBS)
+#define KC_SNUHS S(KC_NUHS)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.
@@ -44,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
      _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______,
+      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12,KC_SNUHS,KC_SNUBS, _______, _______, _______,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
               _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
          //`------------------------------------------------------------------------------------------------------------'
--- a/keyboards/naked48/keymaps/default_with_nafuda/config.h
+++ b/keyboards/naked48/keymaps/default_with_nafuda/config.h
@@ -26,10 +26,6 @@
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180

-#ifdef RGBLED_NUM
-  #undef RGBLED_NUM
-#endif
-
 #define RGBLED_NUM 55    // Number of LEDs
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 48, 7 }
--- a/keyboards/naked48/keymaps/default_with_nafuda/keymap.c
+++ b/keyboards/naked48/keymaps/default_with_nafuda/keymap.c
@@ -26,12 +26,18 @@ enum custom_keycodes {
  RGB_RST = SAFE_RANGE
 };

+// Fillers to make layering more clear
+#define KC_SNUBS S(KC_NUBS)
+#define KC_SNUHS S(KC_NUHS)
+
+#define KC_BSAD LT(_ADJUST, KC_BSPC)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT_with_nafuda(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,              TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-       KC_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
+       KC_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,        KC_BSAD,   KC_UP,TG(_BROWSER),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,        KC_LEFT, KC_DOWN,KC_RIGHT,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
@@ -67,9 +73,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
      KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                   KC_CIRC, KC_AMPR,  KC_ASTR,KC_LPRN, KC_RPRN,  KC_DEL,               TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-       KC_DEL,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,LT(_ADJUST, KC_BSPC),KC_UP,TG(_MOUSE),
+       KC_DEL,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,        KC_BSAD,   KC_UP,TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______,       KC_LEFT, KC_DOWN,KC_RIGHT,
+      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12,KC_SNUHS,KC_SNUBS, _______, _______, _______,        KC_LEFT, KC_DOWN,KC_RIGHT,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
               _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
          //`------------------------------------------------------------------------------------------------------------'
@@ -79,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
      KC_TILD,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL,               TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-       KC_DEL,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6, KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,LT(_ADJUST, KC_BSPC),KC_UP,TG(_MOUSE),
+       KC_DEL,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6, KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,        KC_BSAD,   KC_UP,TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______,        KC_LEFT, KC_DOWN,KC_RIGHT,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
@@ -89,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_ADJUST] = LAYOUT_with_nafuda( /* Base */
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                 RGB_VAD,
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                 RGB_VAD,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR, _ADJUST, RGB_SAD, RGB_VAI,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
--- a/keyboards/naked48/keymaps/default_with_setta21/config.h
+++ b/keyboards/naked48/keymaps/default_with_setta21/config.h
@@ -26,10 +26,6 @@
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180

-#ifdef RGBLED_NUM
-  #undef RGBLED_NUM
-#endif
-
 #define RGBLED_NUM 69    // Number of LEDs
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 48, 21 }
--- a/keyboards/naked48/keymaps/default_with_setta21/keymap.c
+++ b/keyboards/naked48/keymaps/default_with_setta21/keymap.c
@@ -29,14 +29,21 @@ enum custom_keycodes {
  SEND_MIN
 };

+// Fillers to make layering more clear
+#define KC_SNUBS S(KC_NUBS)
+#define KC_SNUHS S(KC_NUHS)
+
+#define KC_RADO LT(_RAISE, KC_PDOT)
+#define KC_LOP0 LT(_LOWER, KC_P0)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT_with_setta21(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NLCK, KC_ESC,
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,       KC_LOP0,  KC_P1,  KC_P4,  KC_P7,KC_NLCK, KC_ESC,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
       KC_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,                 KC_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, KC_EQL,
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,       KC_RADO,  KC_P3,  KC_P6,  KC_P9,KC_PAST, KC_EQL,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
           MO(_ADJUST),KC_LCTRL, KC_LALT, KC_LGUI,MO(_LOWER), KC_SPC, KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT,                        KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL
          //`------------------------------------------------------------------------------------------------------------'               |-----------------------------------------------|
@@ -48,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+--------+-------+-------|
       KC_DEL,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,               KC_DOWN,KC_DOWN,   KC_UP,KC_PSLS,  KC_F2,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+--------+-------+-------|
-      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______,   MO(_RAISE),XXXXXXX,KC_RIGHT,XXXXXXX,KC_PAST, KC_EQL,
+      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,                    KC_F12,KC_SNUHS,KC_SNUBS, _______, _______, _______,    MO(_RAISE),XXXXXXX,KC_RIGHT,XXXXXXX,KC_PAST, KC_EQL,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+----------------+-------+-------|
               _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,                        KC_PENT,         KC_PPLS,KC_PMNS, KC_DEL
          //`------------------------------------------------------------------------------------------------------------'               |------------------------------------------------|
--- a/keyboards/naked48/keymaps/default_with_setta21/readme.md
+++ b/keyboards/naked48/keymaps/default_with_setta21/readme.md
@@ -6,7 +6,7 @@ Add Setta21 maps to the default layout.
 |  1   |  2   |  3   |  4   |
 |:----:|:----:|:----:|:----:|
 |   ESC|    F2|     =|   DEL|
-|   Num|     /|     *|     -|
+|Ad+Num|     /|     *|     -|
 |     7|     8|     9|      |
 |     4|     5|     6|     +|
 |     1|     2|     3|      |
@@ -36,7 +36,7 @@ Add Setta21 maps to the default layout.
 |  1   |  2   |  3   |  4   |
 |:----:|:----:|:----:|:----:|
 |   ESC|    F2|     =|   DEL|
-| XXXXX| XXXXX| XXXXX|     -|
+|ADJUST| XXXXX| XXXXX|     -|
 |LED_SAD|LED_SAI| XXXXX|      |
 |LED_HUD|LED_HUI| XXXXX|     +|
 |LED_VAD|LED_VAI| XXXXX|      |
--- a/keyboards/naked48/keymaps/salicylic/config.h
+++ b/keyboards/naked48/keymaps/salicylic/config.h
@@ -21,10 +21,6 @@
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180

-#ifdef RGBLED_NUM
-  #undef RGBLED_NUM
-#endif
-
 #define DRIVER_LED_TOTAL 48

 #ifdef RGB_MATRIX_ENABLE
--- a/keyboards/naked48/keymaps/salicylic/keymap.c
+++ b/keyboards/naked48/keymaps/salicylic/keymap.c
@@ -26,6 +26,12 @@ enum custom_keycodes {
  RGB_RST = SAFE_RANGE
 };

+// Fillers to make layering more clear
+#define KC_CT11 LCTL_T(KC_F11)
+#define KC_SF12 SFT_T(KC_F12)
+#define KC_LOEN LT(_LOWER, KC_ENT)
+#define KC_RASP LT(_RAISE, KC_SPC)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.
@@ -35,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+               KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC,  KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN,   KC_UP
          //`------------------------------------------------------------------------------------------------------------'
  ),

@@ -57,11 +63,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //,-----------------------------------------------------|                 |-----------------------------------------------------.
       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP,  KC_DEL,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,
+      KC_CT11,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,
+      KC_SF12,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-               _______, _______, _______, KC_MHEN, _______, _______, _______, _______, KC_HENK, _______, _______, _______
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
          //`------------------------------------------------------------------------------------------------------------'
  ),

@@ -95,7 +101,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
            RGB_current_mode = rgblight_config.mode;
          }
        break;
-      case RGB_RST:
+      case RGBRST:
          if (record->event.pressed) {
            eeconfig_update_rgblight_default();
            rgblight_enable();
--- a/keyboards/naked48/keymaps/salicylic/readme.md
+++ b/keyboards/naked48/keymaps/salicylic/readme.md
@@ -1,37 +1,46 @@
 # The salicylic keymap for naked48

-## Default
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|  TAB |     Q|     W|     E|     R|     T|      |      |     Y|     U|     I|     O|     P|     [|
-|LCTRL |     A|     S|     D|     F|     G|      |      |     H|     J|     K|     L|     -|     ]|
-| LSFT |     Z|     X|     C|     V|     B|      |      |     N|     M|     ,|     .|     /|     \|
-|      |  LEFT| RIGHT|  LGUI|  MHEN|LOWER, ENT|BSPC|DEL|RAISE,SPC|HENK|  LALT|  DOWN|    UP|      |
+Default
+  //,-----------------------------------------|             |-----------------------------------------.
+        TAB,     Q,     W,     E,     R,     T,                   Y,     U,     I,     O,     P,     [,
+  //|------+------+------+------+------+------|             |------+------+------+------+------+------|
+       LSFT,     A,     S,     D,     F,     G,                   H,     J,     K,     L,     -,     ],
+  //|------+------+------+------+------+------|             |------+------+------+------+------+------|
+      LCTRL,     Z,     X,     C,     V,     B,                   N,     M,     ,,     .,     /,     \,
+  //|------+------+------+------+------+-------|------+-----+-------+-----+------+------+------|
+              LEFT, RIGHT,  LGUI,  MHEN,Low+Ent,  BSPC,  DEL,Rai+SPC, HENK,  LALT,    UP,  DOWN 
+          //`----------------------------------------------------------------------------------'

+Lower
+  //,-----------------------------------------|             |-----------------------------------------.
+        ESC,  EXLM, JQUES, JLBRC, JRBRC, JTILD,                   6,     7,     8,     9,     *,     /,
+  //|------+------+------+------+------+------|             |------+------+------+------+------+------|
+      JQUOT,  HASH, JDQUO, JLPRN, JRPRN,   JAT,               XXXXX,     4,     5,     6,     -,     =,
+  //|------+------+------+------+------+------|             |------+------+------+------+------+------|
+       JHAT,  PERC, JAMPR,  SCLN, JCLON, JPIPE,                   0,     1,     2,     3,     +,   ENT,
+  //|------+------+------+------+------+------|------+------+------+------+------+------+------|
+              LEFT, RIGHT,  LGUI,  ZKHK, LOWER,  BSPC,  DEL, RAISE,     0,   DOT,     UP,  DOWN 
+          //`----------------------------------------------------------------------------------'

-## Lower
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|   ESC|     !|     ?|     [|     ]|     ~|      |      |     6|     7|     8|     9|     *|     /|
-|     '|     #|     "|     (|     )|     @|      |      | XXXXX|     4|     5|     6|     -|     =|
-|     ^|     %|     &|     ;|     :|  PIPE|      |      |     0|     1|     2|     3|     +|   ENT|
-|      |  LEFT| RIGHT|  LGUI|  ZKHK| LOWER|  BSPC|   DEL| RAISE|  HENK|  LALT|  DOWN|    UP|      |
-
-
-## Raise
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|   ESC|     1|     2|     3|     4|     5|      |      |     6| XXXXX|    UP| XXXXX|  PGUP|   DEL|
-|F11,LCTRL| F1|    F2|    F3|    F4|    F5|      |      | XXXXX|  LEFT|  DOWN| RIGHT|  LSFT|   ENT|
-|F12,LSFT|  F6|    F7|    F8|    F9|   F10|      |      | XXXXX| XXXXX| XXXXX| XXXXX|  PGDN| XXXXX|
-|      |  LEFT| RIGHT|  LGUI|  MHEN| LOWER|  BSPC|   DEL| RAISE|  HENK|  LALT|  DOWN|    UP|      |
-
-
-## Adjust
-|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |    9   |    10  |   11   |   12   |    13   |    14  |
-|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:------:|:------:|:------:|:------:|:-------:|:------:|
-|   ESC| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | RGB_RST|   XXXXX|   XXXXX|   XXXXX|    XXXXX|   XXXXX|
-| LCTRL| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | RGB_TOG| RGB_MOD|   XXXXX|   C+A+D| Alt+PSCR|    PSCR|
-|  LSFT| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | RGB_VAD| RGB_VAI| RGB_HUD| RGB_HUI|  RGB_SAD| RGB_SAI|
-|      |  LEFT| RIGHT|  LGUI|  MHEN| LOWER|  BSPC|   DEL|   RAISE|    HENK|    LALT|    DOWN|       UP|        |
+Raise
+  //,-----------------------------------------|             |-----------------------------------------.
+        ESC,     1,     2,     3,     4,     5,                   6, XXXXX,    UP, XXXXX,  PGUP,  BSPC,
+  //|------+------+------+------+------+------|             |------+------+------+------+------+------|
+   Ctrl F11,    F1,    F2,    F3,    F4,    F5,               XXXXX,  LEFT,  DOWN, RIGHT,  LSFT,   ENT,
+  //|------+------+------+------+------+------|             |------+------+------+------+------+------|
+  Shift F12,    F6,    F7,    F8,    F9,   F10,               XXXXX, XXXXX, XXXXX, XXXXX,  PGDN, XXXXX,
+  //|------+------+------+------+------+------|------+------+------+------+------+------+------|
+              LEFT, RIGHT,  LGUI,  ZKHK, LOWER,  BSPC,  DEL, RAISE,     0,   DOT,     UP,  DOWN
+          //`----------------------------------------------------------------------------------'

+Adjust
+  //,-----------------------------------------|             |----------------------------------------------.
+        ESC,     1,     2,     3,     4,     5,                   6,      7,      8,      9,      0,    DEL,
+  //|------+------+------+------+------+------|             |------+-------+-------+-------+-------+-------|
+   Ctrl F11,    F1,    F2,    F3,    F4,    F5,          LED ON/Off,LED MOD,  XXXXX,  C+A+D,Alt+PSCR,  PSCR,
+  //|------+------+------+------+------+------|             |------+-------+-------+-------+-------+-------|
+  Shift F12,    F6,    F7,    F8,    F9,   F10,             LED VAD,LED VAI,LED HUD,LED HUI,LED SAD,LED SAI,
+  //|------+------+------+------+------+------|------+------+------+-------+-------+-------+-------|
+              LEFT, RIGHT,  LGUI,  ZKHK, LOWER,  BSPC,  DEL, RAISE,       0,    DOT,     UP,   DOWN
+          //`--------------------------------------------------------------------------------------'
+  )
--- a/keyboards/naked48/keymaps/salicylic_with_nafuda/config.h
+++ b/keyboards/naked48/keymaps/salicylic_with_nafuda/config.h
@@ -27,10 +27,6 @@
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180

-#ifdef RGBLED_NUM
-  #undef RGBLED_NUM
-#endif
-
 #define RGBLED_NUM 55    // Number of LEDs
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 48, 7 }
--- a/keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c
+++ b/keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c
@@ -27,16 +27,25 @@ enum custom_keycodes {
  RGB_RST = SAFE_RANGE
 };

+// Fillers to make layering more clear
+#define KC_CT11 LCTL_T(KC_F11)
+#define KC_SF12 SFT_T(KC_F12)
+#define KC_LOEN LT(_LOWER, KC_ENT)
+#define KC_RASP LT(_RAISE, KC_SPC)
+
+#define KC_BSAD LT(_ADJUST, KC_BSPC)
+
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT_with_nafuda(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,              TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
+     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,        KC_BSAD,   KC_UP,TG(_BROWSER),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,        KC_LEFT, KC_DOWN,KC_RIGHT,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+               KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC,  KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN,   KC_UP
          //`------------------------------------------------------------------------------------------------------------'
  ),

@@ -48,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,        KC_MS_L, KC_MS_D, KC_MS_R,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+               KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC,  KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN,   KC_UP
          //`------------------------------------------------------------------------------------------------------------'
  ),

@@ -60,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,LCTL(LSFT(KC_TAB)), KC_WH_D,LCTL(KC_TAB),
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP
+               KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC,  KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN,   KC_UP
          //`------------------------------------------------------------------------------------------------------------'
  ),

@@ -68,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
       KC_ESC, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,                      KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH,              TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-      JP_QUOT, JP_HASH,  JP_DQT, JP_LPRN, JP_RPRN,   JP_AT,                   XXXXXXX,    KC_4,    KC_5,    KC_6, JP_MINS,  JP_EQL,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
+      JP_QUOT, JP_HASH,  JP_DQT, JP_LPRN, JP_RPRN,   JP_AT,                   XXXXXXX,    KC_4,    KC_5,    KC_6, JP_MINS,  JP_EQL,        KC_BSAD,   KC_UP,TG(_BROWSER),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
      JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,                      KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS,  KC_ENT,        KC_LEFT, KC_DOWN,KC_RIGHT,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
@@ -80,17 +89,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
       KC_ESC, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,                      KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH,              TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
+      KC_CT11,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,        KC_BSAD,   KC_UP,TG(_BROWSER),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,        KC_LEFT, KC_DOWN,KC_RIGHT,
+      KC_SF12,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,        KC_LEFT, KC_DOWN,KC_RIGHT,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |--------------------------|
-               _______, _______, _______, KC_MHEN, _______, _______, _______, _______, KC_HENK, _______, _______, _______
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
          //`------------------------------------------------------------------------------------------------------------'
  ),

  [_ADJUST] = LAYOUT_with_nafuda( /* Base */
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                 RGB_VAD,
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                 RGB_VAD,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
     KC_LCTRL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_TOG, RGB_MOD, XXXXXXX,LCA(KC_DEL),LALT(KC_PSCR),KC_PSCR, _ADJUST, RGB_SAD, RGB_VAI,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
--- a/keyboards/naked48/keymaps/salicylic_with_setta21/config.h
+++ b/keyboards/naked48/keymaps/salicylic_with_setta21/config.h
@@ -26,10 +26,6 @@
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 180

-#ifdef RGBLED_NUM
-  #undef RGBLED_NUM
-#endif
-
 #define RGBLED_NUM 69    // Number of LEDs
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 48, 21 }
--- a/keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c
+++ b/keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c
@@ -30,16 +30,25 @@ enum custom_keycodes {
  SEND_MIN
 };

+// Fillers to make layering more clear
+#define KC_CT11 LCTL_T(KC_F11)
+#define KC_SF12 SFT_T(KC_F12)
+#define KC_LOEN LT(_LOWER, KC_ENT)
+#define KC_RASP LT(_RAISE, KC_SPC)
+
+#define KC_RADO LT(_RAISE, KC_PDOT)
+#define KC_LOP0 LT(_LOWER, KC_P0)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT_with_setta21(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NLCK, KC_ESC,
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC,       KC_LOP0,  KC_P1,  KC_P4,  KC_P7,KC_NLCK, KC_ESC,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
     KC_LCTRL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_RBRC,                 KC_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,LT(_RAISE, KC_PDOT),KC_P3,KC_P6, KC_P9,KC_PAST, JP_EQL,
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M, JP_COMM,  JP_DOT, JP_SLSH, JP_BSLS,       KC_RADO,  KC_P3,  KC_P6,  KC_P9,KC_PAST, JP_EQL,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-     KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN,LT(_LOWER, KC_ENT), KC_BSPC,  KC_DEL,LT(_RAISE, KC_SPC),KC_HENK, KC_LALT, KC_DOWN,   KC_UP,               KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL
+               KC_LEFT,KC_RIGHT, KC_LGUI, KC_MHEN, KC_LOEN, KC_BSPC,  KC_DEL, KC_RASP, KC_HENK, KC_LALT, KC_DOWN,   KC_UP,                        KC_PENT,        KC_PPLS,KC_PMNS, KC_DEL
          //`------------------------------------------------------------------------------------------------------------'               |-----------------------------------------------|
  ),

@@ -59,11 +68,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP,  KC_DEL,       _______, KC_F11,  KC_F4,  KC_F7,SEND_MIN, KC_ESC,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,                KC_F12,  KC_F5,  KC_F8,SEND_MAX,  KC_F2,
+      KC_CT11,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                   XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_LSFT,  KC_ENT,                KC_F12,  KC_F5,  KC_F8,SEND_MAX,  KC_F2,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
-SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,       _______,  KC_F3,  KC_F6,  KC_F9,SEND_CIF, JP_EQL,
+      KC_SF12,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX,       _______,  KC_F3,  KC_F6,  KC_F9,SEND_CIF, JP_EQL,
  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|      |---------------+---------------+-------+-------|
-               _______, _______, _______, KC_MHEN, _______, _______, _______, _______, KC_HENK, _______, _______, _______,                        JP_RPRN,       SEND_SUM,SEND_AVE, KC_DEL
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                        JP_RPRN,       SEND_SUM,SEND_AVE, KC_DEL
          //`------------------------------------------------------------------------------------------------------------'               |-----------------------------------------------|
  ),

--- a/keyboards/naked48/keymaps/salicylic_with_setta21/readme.md
+++ b/keyboards/naked48/keymaps/salicylic_with_setta21/readme.md
@@ -2,43 +2,46 @@

 Add Setta21 maps to the salicylic layout.

-## Default
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-|   Num|     /|     *|     -|
-|     7|     8|     9|      |
-|     4|     5|     6|     +|
-|     1|     2|     3|      |
-| Rai+0|      | LOW + .|   ENT|
+Default
+  //|-----------------------------------------|
+      Rai+0,     1,     4,     7,Ad+Num,   ESC,
+  //|------+------+------+------+------+------|
+                 2,     5,     8,     /,    F2,
+  //|------+------+------+------+------+------|
+      Low+.,     3,     6,     9,     *,     =,
+  //|-------------+-------------+------+------|
+               ENT,            +,     -,   DEL 
+  //|-----------------------------------------|

-## Lower
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-| =MIN(| =MAX(|=COUNTIF(|=AVERAGE(|
-|    F7|    F8|    F9|      |
-|    F4|    F5|    F6| =SUM(|
-|   F11|   F12|    F3|      |
-| RAISE|      | LOWER|     )|
+Lower
+  //|-----------------------------------------|
+      RAISE,   F11,    F4,    F7,    "=MIN(",   ESC,
+  //|------+------+------+------+-----------+------|
+               F12,    F5,    F8,    "=MAX(",    F2,
+  //|------+------+------+------+-----------+------|
+      LOWER,    F3,    F6,    F9,"=COUNTIF(",     =,
+  //|-------------+-------------+-----------+------|
+                 ),      "=SUM(","=AVERAGE(",   DEL 
+  //|-----------------------------------------|

-## Raise
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-| XXXXX|     /|     *|     -|
-| XXXXX|    UP| XXXXX|      |
-|  LEFT|  DOWN| RIGHT|     +|
-| XXXXX|  DOWN| XXXXX|      |
-| RAISE|      | LOWER|   ENT|
-
-## Adjust
-|  1   |  2   |  3   |  4   |
-|:----:|:----:|:----:|:----:|
-|   ESC|    F2|     =|   DEL|
-| XXXXX| XXXXX| XXXXX|     -|
-|LED_SAD|LED_SAI| XXXXX|      |
-|LED_HUD|LED_HUI| XXXXX|     +|
-|LED_VAD|LED_VAI| XXXXX|      |
-|LED_ON/Off|      | XXXXX|LED_MOD|
+Raise
+  //|-----------------------------------------|
+      RAISE, XXXXX,  LEFT, XXXXX, XXXXX,   ESC,
+  //|------+------+------+------+------+------|
+              DOWN,  DOWN,    UP,     /,    F2,
+  //|------+------+------+------+------+------|
+      LOWER, XXXXX, RIGHT, XXXXX,     *,     =,
+  //|-------------+-------------+------+------|
+               ENT,            +,     -,   DEL 
+  //|-----------------------------------------|

+Adjust
+  //|------------------------------------------------|
+   LED ON/Off,LED VAD,LED HUD,LED SAD, ADJUST,    ESC,
+  //|--------+-------+-------+-------+-------+-------|
+              LED VAI,LED HUI,LED SAI,  XXXXX,     F2,
+  //|--------+-------+-------+-------+-------+-------|
+        XXXXX,  XXXXX,   XXXXX, XXXXX,  XXXXX,      =,
+  //|----------------+---------------+-------+-------|
+              LED MOD,              +,      -,    DEL 
+  //|------------------------------------------------|
--- a/keyboards/naked48/rev1/config.h
+++ b/keyboards/naked48/rev1/config.h
@@ -52,11 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 /* ws2812 RGB LED */
 #define RGB_DI_PIN D3
-
-#ifndef RGBLED_NUM
-  #define RGBLED_NUM 48
-#endif
-
 #define RGBLIGHT_ANIMATIONS

 #ifndef IOS_DEVICE_ENABLE
@@ -69,6 +64,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17

+// Selection of RGBLIGHT MODE to use.
+#if defined(LED_ANIMATIONS)
+   //#define RGBLIGHT_EFFECT_BREATHING
+   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+   //#define RGBLIGHT_EFFECT_SNAKE
+   #define RGBLIGHT_EFFECT_KNIGHT
+   //#define RGBLIGHT_EFFECT_CHRISTMAS
+   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+   //#define RGBLIGHT_EFFECT_RGB_TEST
+   //#define RGBLIGHT_EFFECT_ALTERNATING
+#endif
+
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
 //  120  RGBoff, OLEDoff
--- a/keyboards/naked60/keymaps/default/keymap.c
+++ b/keyboards/naked60/keymaps/default/keymap.c
@@ -16,10 +16,20 @@ enum layer_number {
  _ADJUST,
 };

+enum tapdances{
+  TD_ESFL = 0,
+  TD_ESQW,
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [TD_ESFL] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _FLOCK),
+  [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
+};
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
+  TD(TD_ESFL),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, 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_BSLS,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
@@ -34,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_FLOCK] = LAYOUT(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.
-   TG(_FLOCK),   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11, _______,
+  TD(TD_ESQW),   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11, _______,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
@@ -79,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_ADJUST] = LAYOUT( /* Base */
  //,-----------------------------------------------------|                 |-----------------------------------------------------.
-   TG(_FLOCK),   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
+       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,LALT(KC_PSCR),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|
--- a/keyboards/naked60/keymaps/default/readme.md
+++ b/keyboards/naked60/keymaps/default/readme.md
@@ -3,7 +3,7 @@
 ## Default
 |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
 |:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|  ESC |     1|     2|     3|     4|     5|      |      |     6|     7|     8|     9|     0|  BSPC|
+| ESC(FLock) |  1|  2|     3|     4|     5|      |      |     6|     7|     8|     9|     0|  BSPC|
 |  TAB |     Q|     W|     E|     R|     T|      |      |     Y|     U|     I|     O|     P|    \ |
 | LSFT |     A|     S|     D|     F|     G|      |      |     H|     J|     K|     L|     ;|     '|
 |LCTRL |     Z|     X|     C|     V|     B|      |      |     N|     M|     ,|     .|     /|   ENT|
@@ -14,7 +14,7 @@
 ## FLock
 |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
 |:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-| FLock|    F2|    F3|    F4|    F5|    F6|      |      |    F7|    F8|    F9|   F10|   F11|  BSPC|
+|  ESC(FLock)| F2| F3|    F4|    F5|    F6|      |      |    F7|    F8|    F9|   F10|   F11|  BSPC|
 |  TAB |     Q|     W|     E|     R|     T|      |      |     Y|     U|     I|     O|     P|  BSLS|
 | LSFT |     A|     S|     D|     F|     G|      |      |     H|     J|     K|     L|  SCLN|  QUOT|
 |LCTRL |     Z|     X|     C|     V|     B|      |      |     N|     M|  COMM|   DOT|  SLSH|   ENT|
@@ -45,7 +45,7 @@
 ## Adjust
 |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
 |:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-| FLock|    F2|    F3|    F4|    F5|    F6|      |      |    F7|    F8|    F9|   F10|   F11|   F12|
+|   ESC|    F2|    F3|    F4|    F5|    F6|      |      |    F7|    F8|    F9|   F10|   F11|   F12|
 |  TILD| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | XXXXX|  BTN1|  MS_U|  BTN2| XXXXX|Alt+PSCR|
 |  LSFT| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | XXXXX|  MS_L|  MS_D|  MS_R| XXXXX|  PSCR|
 | LCTRL| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | XXXXX| XXXXX| XXXXX| XXXXX| XXXXX| C+A+D|
--- a/keyboards/naked60/keymaps/default_with_nafuda/keymap.c
+++ b/keyboards/naked60/keymaps/default_with_nafuda/keymap.c
@@ -22,10 +22,20 @@ enum custom_keycodes {
  RGB_RST = SAFE_RANGE
 };

+enum tapdances{
+  TD_ESFL = 0,
+  TD_ESQW,
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [TD_ESFL] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _FLOCK),
+  [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
+};
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT_with_nafuda(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,              TG(_MOUSE),
+  TD(TD_ESFL),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,              TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS,LT(_ADJUST, KC_BSPC),KC_UP,TG(_BROWSER),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
@@ -39,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_FLOCK] = LAYOUT_with_nafuda(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-   TG(_FLOCK),   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11, _______,                 _______,
+  TD(TD_ESQW),   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11, _______,                 _______,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,        _______, _______, _______,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
@@ -53,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_MOUSE] = LAYOUT_with_nafuda(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,              TG(_MOUSE),
+  TD(TD_ESFL),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,              TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,        KC_BTN1, KC_MS_U, KC_BTN2,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
@@ -81,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_LOWER] = LAYOUT_with_nafuda(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-      _______,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,               TG(_MOUSE),
+       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,               TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
      KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                   KC_CIRC, KC_AMPR,  KC_ASTR,KC_LPRN, KC_RPRN,  KC_DEL,LT(_ADJUST, KC_BSPC),   KC_UP,TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
@@ -95,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_RAISE] = LAYOUT_with_nafuda(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-      _______,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,               TG(_MOUSE),
+       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,               TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
      KC_TILD,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL,LT(_ADJUST, KC_BSPC),   KC_UP,TG(_MOUSE),
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
@@ -109,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_ADJUST] = LAYOUT_with_nafuda( /* Base */
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |--------------------------|
-   TG(_FLOCK),   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,                 RGB_VAD,
+       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,                 RGB_VAD,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,LALT(KC_PSCR),   _ADJUST, RGB_SAD, RGB_VAI,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |--------+--------+--------|
--- a/keyboards/naked60/keymaps/default_with_setta21/keymap.c
+++ b/keyboards/naked60/keymaps/default_with_setta21/keymap.c
@@ -2,6 +2,11 @@

 extern keymap_config_t keymap_config;

+#ifdef RGBLIGHT_ENABLE
+//Following line allows macro to read current RGB settings
+extern rgblight_config_t rgblight_config;
+#endif
+
 extern uint8_t is_master;

 // Each layer gets a name for readability, which is then used in the keymap matrix below.
@@ -25,10 +30,20 @@ enum custom_keycodes {
  SEND_MIN
 };

+enum tapdances{
+  TD_ESFL = 0,
+  TD_ESQW,
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [TD_ESFL] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _FLOCK),
+  [TD_ESQW] = ACTION_TAP_DANCE_DUAL_ROLE(KC_ESC, _QWERTY),
+};
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = LAYOUT_with_setta21(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NLCK, KC_ESC,
+  TD(TD_ESFL),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,LT(_LOWER, KC_P0),KC_P1, KC_P4,  KC_P7,KC_NLCK, KC_ESC,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS,                 KC_P2,  KC_P5,  KC_P8,KC_PSLS,  KC_F2,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
@@ -42,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_FLOCK] = LAYOUT_with_setta21(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-   TG(_FLOCK),   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11, _______,       _______,_______,_______,_______,_______,_______,
+  TD(TD_ESQW),   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11, _______,       _______,_______,_______,_______,_______,_______,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
      _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,               _______,_______,_______,_______,_______,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
@@ -70,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_RAISE] = LAYOUT_with_setta21(
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |------------------------------------------------|
-      _______,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       _______, KC_F11,  KC_F4,  KC_F7,SEND_MIN, KC_ESC,
+       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       _______, KC_F11,  KC_F4,  KC_F7,SEND_MIN, KC_ESC,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+--------+-------|
      KC_TILD,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL,                KC_F12,  KC_F5,  KC_F8,SEND_MAX,  KC_F2,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+--------+-------|
@@ -84,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_ADJUST] = LAYOUT_with_setta21( /* Base */
  //,-----------------------------------------------------|                 |-----------------------------------------------------.      |-----------------------------------------------|
-   TG(_FLOCK),   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       _______,RGB_VAD,RGB_HUD,RGB_SAD,XXXXXXX,_______,
+       KC_ESC,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,       _______,RGB_VAD,RGB_HUD,RGB_SAD,XXXXXXX,_______,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,LALT(KC_PSCR),          RGB_VAI,RGB_HUI,RGB_SAI,XXXXXXX,_______,
  //|--------+--------+--------+--------+--------+--------|                 |--------+--------+--------+--------+--------+--------|      |-------+-------+-------+-------+-------+-------|
--- a/keyboards/naked60/keymaps/salicylic/rules.mk
+++ b/keyboards/naked60/keymaps/salicylic/rules.mk
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
--- a/keyboards/naked60/keymaps/salicylic_with_nafuda/rules.mk
+++ b/keyboards/naked60/keymaps/salicylic_with_nafuda/rules.mk
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
--- a/keyboards/naked60/keymaps/salicylic_with_setta21/rules.mk
+++ b/keyboards/naked60/keymaps/salicylic_with_setta21/rules.mk
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
--- a/keyboards/naked60/rules.mk
+++ b/keyboards/naked60/rules.mk
@@ -27,6 +27,7 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
+TAP_DANCE_ENABLE = yes
 OLED_DRIVER_ENABLE = no
 USE_I2C = no
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
--- a/keyboards/sck/gtm/config.h
+++ b/keyboards/sck/gtm/config.h
@@ -1,44 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6090
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    SpaceCityKeyboards
-#define PRODUCT         GTM Pad
-#define DESCRIPTION     Grand Theft Macro Pad
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 6
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C4, C5, D1 }
-#define MATRIX_COL_PINS { B4, B5, B6, B7, C7, D0 }
-#define UNUSED_PINS
-
-
-#define ENCODERS_PAD_A { D2 }
-#define ENCODERS_PAD_B { D3 }
-#define ENCODER_RESOLUTION 1
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* 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
-
-
-#ifdef RGBLIGHT_ENABLE
-#define RGB_DI_PIN B0
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 4
-#endif
--- a/keyboards/sck/gtm/gtm.c
+++ b/keyboards/sck/gtm/gtm.c
@@ -1 +0,0 @@
-#include "gtm.h"
--- a/keyboards/sck/gtm/gtm.h
+++ b/keyboards/sck/gtm/gtm.h
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, K04, \
-	K10, K11, K12, K13, K14, K25 \
-) { \
-	{ K00,    K01,    K02,    K03,    K04,    KC_NO }, \
-	{ K10,    K11,    K12,    K13,    K14,    KC_NO }, \
-    { KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K25 }, \
-}
--- a/keyboards/sck/gtm/keymaps/default/keymap.c
+++ b/keyboards/sck/gtm/keymaps/default/keymap.c
@@ -1,24 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-LAYOUT(
-    KC_1, KC_2, KC_3, KC_4, KC_5,
-    KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENTER),
-
-};
-
-void matrix_init_user(void) {
-  debug_config.matrix = 1;
-  debug_config.keyboard = 1;
-  debug_config.enable = 1;
-}
-
-void encoder_update_user(int8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_PGUP);
-    } else {
-      tap_code(KC_PGDN);
-    }
-}
-
--- a/keyboards/sck/gtm/keymaps/tabs/keymap.c
+++ b/keyboards/sck/gtm/keymaps/tabs/keymap.c
@@ -1,24 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-LAYOUT(
-    KC_1, KC_2, KC_3, KC_4, KC_5,
-    KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENTER),
-
-};
-
-void matrix_init_user(void) {
-  debug_config.matrix = 1;
-  debug_config.keyboard = 1;
-  debug_config.enable = 1;
-}
-
-void encoder_update_user(int8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code16(C(KC_T));
-    } else {
-      tap_code16(C(KC_W));
-    }
-}
-
--- a/keyboards/sck/gtm/keymaps/vol/keymap.c
+++ b/keyboards/sck/gtm/keymaps/vol/keymap.c
@@ -1,23 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-LAYOUT(
-    KC_1, KC_2, KC_3, KC_4, KC_5,
-    KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENTER),
-
-};
-
-void matrix_init_user(void) {
-  debug_config.matrix = 1;
-  debug_config.keyboard = 1;
-  debug_config.enable = 1;
-}
-
-void encoder_update_user(int8_t index, bool clockwise) {
-    if (clockwise) {
-     tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-}
--- a/keyboards/sck/gtm/readme.md
+++ b/keyboards/sck/gtm/readme.md
@@ -1,16 +0,0 @@
-# Grand Theft Macro Pad
-
-![Grand Theft Macropad](https://i.imgur.com/ON7m7RI.jpg)
-
-A 2x5 macropad/numpad with a rotary encoder, cloned from the 2Key2Crawl macropad that was exclusively available at Austin Keycrawl 2018 (12-01-2018).
-
-Keyboard Maintainer: jrfhoutx  
-Keyboard Designer: [jrfhoutx](https://github.com/jrfhoutx)  
-Hardware Supported: GTM Pad  
-Hardware Availability: Coming Soon
-
-Make example for this keyboard (after setting up your build environment):
-
-    make sck/gtm: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/sck/gtm/rules.mk
+++ b/keyboards/sck/gtm/rules.mk
@@ -1,27 +0,0 @@
-# MCU name
-MCU = atmega32u2
-
-# Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = lite	# Virtual DIP switch configuration
-MOUSEKEY_ENABLE = no	# Mouse keys
-EXTRAKEY_ENABLE = no	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = no    # Commands for debug and configuration
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no  # [Crawlpad] Custom backlighting code is used, so this should not be enabled
-AUDIO_ENABLE = no # [Crawlpad] This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE = yes # [Crawlpad] This can be enabled if a ws2812 strip is connected to the expansion port.
-ENCODER_ENABLE = yes # [2Key2crawl] Make the knobs turn
--- a/lib/python/milc.py
+++ b/lib/python/milc.py
@@ -429,12 +429,11 @@ class MILC(object):
                self.arg_only.append(arg_name)
                del kwargs['arg_only']

-            name = handler.__name__.replace("_", "-")
            if handler is self._entrypoint:
                self.add_argument(*args, **kwargs)

-            elif name in self.subcommands:
-                self.subcommands[name].add_argument(*args, **kwargs)
+            elif handler.__name__ in self.subcommands:
+                self.subcommands[handler.__name__].add_argument(*args, **kwargs)

            else:
                raise RuntimeError('Decorated function is not entrypoint or subcommand!')
@@ -600,7 +599,7 @@ class MILC(object):
            self.add_subparsers()

        if not name:
-            name = handler.__name__.replace("_", "-")
+            name = handler.__name__

        self.acquire_lock()
        kwargs['help'] = description
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -40,7 +40,7 @@ def test_pyformat():


 def test_list_keyboards():
-    result = check_subcommand('list-keyboards')
+    result = check_subcommand('list_keyboards')
    assert result.returncode == 0
    # check to see if a known keyboard is returned
    # this will fail if handwired/onekey/pytest is removed
--- a/tmk_core/common/wait.h
+++ b/tmk_core/common/wait.h
@@ -13,22 +13,10 @@ extern "C" {
 #    define wait_us(us) _delay_us(us)
 #elif defined PROTOCOL_CHIBIOS
 #    include "ch.h"
-#    define wait_ms(ms)                     \
-        do {                                \
-            if (ms != 0) {                  \
-                chThdSleepMilliseconds(ms); \
-            } else {                        \
-                chThdSleepMicroseconds(1);  \
-            }                               \
-        } while (0)
-#    define wait_us(us)                     \
-        do {                                \
-            if (us != 0) {                  \
-                chThdSleepMicroseconds(us); \
-            } else {                        \
-                chThdSleepMicroseconds(1);  \
-            }                               \
-        } while (0)
+#    include "hal.h"
+// FIXME: This doesn't compile if `NKRO_ENABLED = no`
+#    define wait_ms(ms) chSysPolledDelayX(MS2RTC(STM32_SYSCLK, ms))
+#    define wait_us(us) chSysPolledDelayX(US2RTC(STM32_SYSCLK, us))
 #elif defined PROTOCOL_ARM_ATSAM
 #    include "clks.h"
 #    define wait_ms(ms) CLK_delay_ms(ms)
Author	SHA1	Message	Date
skullydazed	699e6b229b	Update tmk_core/common/wait.h Co-Authored-By: Joel Challis <git@zvecr.com>	2019-10-23 13:35:39 -07:00
skullydazed	e180496ab4	Update tmk_core/common/wait.h Co-Authored-By: Drashna Jaelre <drashna@live.com>	2019-10-22 23:57:09 -07:00
skullydazed	e5864cd471	Update tmk_core/common/wait.h Co-Authored-By: Drashna Jaelre <drashna@live.com>	2019-10-22 23:57:04 -07:00
skullY	1615d768ea	Use the method @zvecr identified to wait more accurately on chibios	2019-10-22 23:20:00 -07:00